From 01ccf1aaca358a5fd0e753b33db6ce7e5a8c9a0c Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Fri, 12 Nov 2010 16:31:01 -0500
Subject: [PATCH] fix some bugs with item loading

whole outfit saved on toggleStar, which was not intended
saving and then loading an outfit on same session glitched on clone
---
 app/models/outfit.rb           |  2 +-
 public/javascripts/wardrobe.js | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/models/outfit.rb b/app/models/outfit.rb
index 1f473725..2911f3af 100644
--- a/app/models/outfit.rb
+++ b/app/models/outfit.rb
@@ -1,5 +1,5 @@
 class Outfit < ActiveRecord::Base
-  has_many :item_outfit_relationships
+  has_many :item_outfit_relationships, :dependent => :destroy
   belongs_to :pet_state
   belongs_to :user
   
diff --git a/public/javascripts/wardrobe.js b/public/javascripts/wardrobe.js
index 0a8fa5b6..5b95033a 100644
--- a/public/javascripts/wardrobe.js
+++ b/public/javascripts/wardrobe.js
@@ -376,8 +376,7 @@ function Wardrobe() {
     }
     
     this.toggleStar = function (success) {
-      this.starred = !this.starred;
-      this.update(success);
+      this.updateAttributes({starred: !outfit.starred}, success);
     }
     
     this.unclosetItem = function (item, updateClosetItemsCallback, updateWornItemsCallback) {
@@ -427,18 +426,23 @@ function Wardrobe() {
     }
     
     this.clone = function () {
-      return new Outfit({
+      var outfit_data = {
         color_id: outfit.color_id,
         id: outfit.id,
         name: outfit.name,
         species_id: outfit.species_id,
         starred: outfit.starred,
         pet_state_id: outfit.pet_state_id,
-        worn_and_unworn_item_ids: {
+      };
+      if(typeof outfit.worn_and_unworn_item_ids !== 'undefined') {
+        outfit_data.worn_and_unworn_item_ids = {
           worn: outfit.worn_and_unworn_item_ids.worn.slice(0),
           unworn: outfit.worn_and_unworn_item_ids.unworn.slice(0)
         }
-      });
+      } else {
+        outfit_data.worn_and_unworn_item_ids = sortWornUnworn();
+      }
+      return new Outfit(outfit_data);
     }
     
     this.destroy = function (success) {
@@ -470,11 +474,13 @@ function Wardrobe() {
       });
     }
     
-    this.update = function (success) {
-      var outfit_data = sortWornUnworn();
-      outfit_data.name = outfit.name;
-      outfit_data.starred = outfit.starred;
-      if(outfit.pet_state) outfit_data.pet_state_id = outfit.pet_state.id;
+    this.updateAttributes = function (attributes, success) {
+      var outfit_data = {};
+      for(var key in attributes) {
+        if(attributes.hasOwnProperty(key)) {
+          outfit_data[key] = outfit[key] = attributes[key];
+        }
+      }
       $.ajax({
         url: '/outfits/' + outfit.id,
         type: 'post',