From 84ff044803e4dc54b2eafd529c3c4b21a6c28edc Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Fri, 2 May 2014 08:03:26 +0900
Subject: [PATCH] fix update

---
 app/controllers/licenses_controller.rb | 2 +-
 app/models/scroll.rb                   | 1 +
 lib/manifest/item/base.rb              | 6 ++++++
 lib/manifest/item/boost.rb             | 4 ++++
 lib/peta/item.rb                       | 3 ++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index fe930713..a7424131 100644
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -86,7 +86,7 @@ class LicensesController < ApplicationController
 
   def update
     @item = self.class.model.edit(params[:id], @operators)
-    self.class.model.fold_extend_settings params
+    self.class.model.fold_extend_settings params[:license]
     @item.attributes = params[:license]
     @item.overwrite 
     respond_to do |format|
diff --git a/app/models/scroll.rb b/app/models/scroll.rb
index e7c9f559..2fd03f8b 100644
--- a/app/models/scroll.rb
+++ b/app/models/scroll.rb
@@ -14,6 +14,7 @@ class Scroll < Peta::Binder
   def overwrite operators
     return false unless operators.author
     self.author_id = operators.author.id
+    super()
   end
   
   def visible? operators
diff --git a/lib/manifest/item/base.rb b/lib/manifest/item/base.rb
index cfe34ac8..27e10b3d 100644
--- a/lib/manifest/item/base.rb
+++ b/lib/manifest/item/base.rb
@@ -48,6 +48,12 @@ module Manifest
         end
       end
       
+      def overwrites item
+        @boost.each do |name, manifest|
+          manifest.overwrite item
+        end
+      end
+      
       def model
         ::Manifest.item_name_to_model @name
       end
diff --git a/lib/manifest/item/boost.rb b/lib/manifest/item/boost.rb
index 60509e8d..022d3873 100644
--- a/lib/manifest/item/boost.rb
+++ b/lib/manifest/item/boost.rb
@@ -50,6 +50,10 @@ module Manifest
         self.engine_model(item).engine_extend_module.supply_default item, self
       end
       
+      def overwrite item
+        self.engine_model(item).engine_extend_module.overwrite item, self
+      end
+      
     end
   end
 end
diff --git a/lib/peta/item.rb b/lib/peta/item.rb
index 74ae0273..7b991bbb 100644
--- a/lib/peta/item.rb
+++ b/lib/peta/item.rb
@@ -159,7 +159,7 @@ module Peta
     def valid_encode
       self.class.valid_encode_columns.each do |a|
         next if attributes[a] == nil
-        raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+        raise Pettanr::BadRequest unless self.attributes[a].valid_encoding?
       end
     end
     
@@ -188,6 +188,7 @@ module Peta
     end
     
     def overwrite 
+      self.class.my_peta.overwrites self
     end
     
     def user_visible? operators
-- 
2.11.0