Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

Conflicts:
	lib/tasks/migrate.rake

app/controllers/admin/tags_controller.rb

@@ -46,12 +46,16 @@ class Admin::TagsController < OrbitBackendController
   
   protected
   
-  def set_module_app
-    @module_app ||= ModuleApp.first(:conditions => {:key => @app_title.underscore}) rescue nil
-  end
-  
   def get_tags
     @tags = (@module_app ?  @module_app.tags : Tag.all)
   end
+
+  def setup_vars
+    @app_key = request.env['HTTP_REFERER'].split('/')[4]
+    if @app_key
+      @app_key.gsub!(/[?].*/, '')
+      @module_app = ModuleApp.first(conditions: {:key => @app_key})
+    end
+  end
   
 end

app/models/item.rb

@@ -47,10 +47,10 @@ class Item
       new_parent = Item.find(new_parent)
       current_position_sibling = find_by_parent_and_position(new_parent, position.to_i)
       if current_position_sibling
-        current_position_sibling.at_bottom? ? move_below(current_position_sibling) : move_above(current_position_sibling)
+        move_above(current_position_sibling)
       elsif self.parent != new_parent
         self.parent = new_parent
-        save!
+        save
       end
     end
   end

app/models/page.rb

@@ -24,14 +24,12 @@ class Page < Item
   has_many :page_metas, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :page_parts, :allow_destroy => true
 
-  before_save :delete_empty_frontend_field
   before_save :create_parts, if: Proc.new { |page| page.new_record? || page.design_id_changed? }
-  after_save :generate_html
+  before_save :delete_empty_frontend_field, :generate_html
 
-#  protected
+  protected
   
   def create_parts
-    
     page_design = self.design
     parent = self.parent
     menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
@@ -73,10 +71,7 @@ class Page < Item
   end
 
   def generate_html
-    Page.without_callback(:save, :after, :generate_html) do
-      self.content_translations = parse_page_noko(self, Site.first)
-      self.save
-    end
+    self.content_translations = parse_page_noko(self, Site.first)
   end
   
 end