Rearrange insertion of new custom fields so they appear in correctly …

…sorted order.
fatfreecrm · Sep 22, 2012 · 5d22faf · 5d22faf
1 parent bea21d1
commit 5d22faf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/views/admin/field_groups/_field_group.html.haml b/app/views/admin/field_groups/_field_group.html.haml
@@ -15,13 +15,13 @@
 
   .subtitle{ :id => "#{dom_id(field_group)}_title" }= field_group_subtitle(field_group)
 
-  .remote{ hidden.merge(:id => edit_form_id) }
-  .remote{ hidden.merge(:id => create_form_id) }
-
   .list{ :id => dom_id(field_group, :fields) }
     - if (fields = field_group.fields.without_pairs).present?
       = render :partial => "admin/fields/field", :collection => fields
     - else
       %div{:id => "empty_#{asset}_field_group_#{field_group.id}"}
         = t(:field_group_empty)
         = link_to_inline(create_form_id, new_admin_field_path(:field_group_id => field_group.id), :plain => true, :text => t(:create_field))
+
+    .remote{ hidden.merge(:id => edit_form_id) }
+    .remote{ hidden.merge(:id => create_form_id) }
diff --git a/app/views/admin/field_groups/create.js.rjs b/app/views/admin/field_groups/create.js.rjs
@@ -6,7 +6,7 @@ container_id = "#{asset}_field_groups"
 if @field_group.valid?
   page["#{id}_arrow"].replace_html "&#9658;"
   page.visual_effect :toggle_blind, id, :duration => 0.3, :afterFinish => 'function(effect) {effect.element.update("")}'
-  page.insert_html :top, container_id, :partial => "field_group", :collection => [ @field_group ]
+  page.insert_html :bottom, container_id, :partial => "field_group", :collection => [ @field_group ]
   group_list_ids = klass.field_groups.map {|field_group| dom_id(field_group, :fields)}
   klass.field_groups.each do |field_group|
     page.insert_html :bottom, container_id, sortable_element(dom_id(field_group, :fields), :url => sort_admin_fields_path(:field_group_id => field_group.id), :containment => group_list_ids, :dropOnEmpty => true)
@@ -18,4 +18,3 @@ else
   page[id].replace_html :partial => "new"
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
 end
-
diff --git a/app/views/admin/fields/create.js.rjs b/app/views/admin/fields/create.js.rjs
@@ -4,7 +4,7 @@ container_id = dom_id(@field.field_group, :fields)
 if @field.valid?
   page["#{id}_arrow"].replace_html "&#9658;"
   page.visual_effect :toggle_blind, id, :duration => 0.3, :afterFinish => 'function(effect) {effect.element.update("")}'
-  page.insert_html :top, container_id, :partial => "field", :collection => [ @field ]
+  page.insert_html :bottom, container_id, :partial => "field", :collection => [ @field ]
   page.insert_html :bottom, container_id, sortable_element(container_id, :url => sort_admin_fields_path(:field_group_id => @field.field_group_id))
   page[dom_id(@field)].visual_effect :highlight, :duration => 1.5
   page.call "crm.flick", :empty, :remove
@@ -13,4 +13,3 @@ else
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
   page[:field_label].focus
 end
-
diff --git a/app/views/admin/fields/index.html.haml b/app/views/admin/fields/index.html.haml
@@ -23,8 +23,6 @@
     .title
       = t(asset)
 
-    .remote{ hidden.merge(:id => create_form_id) }
-
     - container_id = "#{asset}_field_groups"
     .list{ :id => container_id }
       = render :partial => "admin/field_groups/field_group", :collection => klass.field_groups, :locals => {:asset => asset, :klass => klass}
@@ -34,3 +32,5 @@
       = sortable_element(dom_id(field_group, :fields), :url => sort_admin_fields_path(:field_group_id => field_group.id), :containment => group_list_ids, :dropOnEmpty => true)
 
     = sortable_element(container_id, :url => sort_admin_field_groups_path(:asset => asset), :tag => :div)
+
+    .remote{ hidden.merge(:id => create_form_id) }