constructor-pages 0.2.8 → 0.2.9

data/app/controllers/constructor_pages/fields_controller.rb

@@ -31,6 +31,23 @@ module ConstructorPages
     def update
       @field = Field.find params[:id]
 
+        if @field.type_value != params[:field][:type_value]
+          "constructor_pages/types/#{@field.type_value}_type".classify.constantize.where(:field_id => @field.id).each do |field|
+            new_field = "constructor_pages/types/#{params[:field][:type_value]}_type".classify.constantize.new(
+                :field_id => @field.id,
+                :page_id => field.page_id)
+
+            if @field.type_value != 'image' \
+            and params[:field][:type_value] != 'image' \
+            and not (@field.type_value == 'string' and field.value.strip == '')
+                new_field.value = field.value
+            end
+
+            new_field.save
+
+            field.destroy
+          end
+        end
       if @field.update_attributes params[:field]
         redirect_to edit_template_url(@field.template.id), :notice => "Поле «#{@field.name}» успешно обновлено."
       else

data/app/controllers/constructor_pages/pages_controller.rb

@@ -134,28 +134,37 @@ module ConstructorPages
     def update
       @page = Page.find params[:id]
 
-      @page.template.fields.each do |field|
-        f = "constructor_pages/types/#{field.type_value}_type".classify.constantize.where(
-            :field_id => field.id,
-            :page_id => @page.id).first_or_create
-
-        if params[:fields]
-          f.value = 0 if field.type_value == 'boolean'
-
-          if params[:fields][field.type_value]
-            if field.type_value == "date"
-              value = params[:fields][field.type_value][field.id.to_s]
-              f.value = Date.new(value["date(1i)"].to_i, value["date(2i)"].to_i, value["date(3i)"].to_i).to_s
-            else
-              f.value = params[:fields][field.type_value][field.id.to_s]
-            end
-          end
-
-          f.save
+      if @page.template.id != params[:page][:template_id].to_i
+        @page.template.fields.each do |field|
+          "constructor_pages/types/#{field.type_value}_type".classify.constantize.destroy_all(
+              :field_id => field.id,
+              :page_id => @page.id)
         end
       end
 
       if @page.update_attributes params[:page]
+
+        @page.template.fields.each do |field|
+          f = "constructor_pages/types/#{field.type_value}_type".classify.constantize.where(
+              :field_id => field.id,
+              :page_id => @page.id).first_or_create
+
+          if params[:fields]
+            f.value = 0 if field.type_value == 'boolean'
+
+            if params[:fields][field.type_value]
+              if field.type_value == "date"
+                value = params[:fields][field.type_value][field.id.to_s]
+                f.value = Date.new(value["date(1i)"].to_i, value["date(2i)"].to_i, value["date(3i)"].to_i).to_s
+              else
+                f.value = params[:fields][field.type_value][field.id.to_s]
+              end
+            end
+
+            f.save
+          end
+        end
+
         redirect_to pages_url, :notice => "Страница «#{@page.name}» успешно обновлена."
       else
         render :action => "edit"

data/app/views/constructor_pages/fields/_form.haml

@@ -15,14 +15,15 @@
       .controls= f.text_field :code_name, :class => "span4"
       = f.hidden_field :template_id, :value => @field.template.id, :class => "span4"
 
-    .control-group
-      = f.label :type_value, :class => 'control-label'
-      .controls
-        = f.select :type_value, options_for_select(types_value, :selected => @field.type_value), :class => "span4"
+    - unless @field.type_value == 'image'
+      .control-group
+        = f.label :type_value, :class => 'control-label'
+        .controls
+          = f.select :type_value, options_for_select(types_value, :selected => @field.type_value), :class => "span4"
 
     .row-fluid
       .span12
         .form-actions
           .btn-group
             = f.submit :class => "btn btn-primary"
-            = link_to "Отмена", template_url(@field.template), :class => "btn"
+            = link_to "Отмена", edit_template_url(@field.template), :class => "btn"

data/constructor-pages.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{constructor-pages}
-  s.version           = '0.2.8'
+  s.version           = '0.2.9'
   s.summary           = %q{Pages for ConstructorCms}
   s.authors           = ['Ivan Zotov']
   s.require_paths     = %w(lib)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors: