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

Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake

app/controllers/admin/assets_controller.rb

@@ -88,7 +88,7 @@ class Admin::AssetsController < OrbitBackendController
 
   def delete
     if params[:ids]
-      asset = Asset.any_in(:_id => params[:ids]).delete_all
+      asset = Asset.any_in(:_id => params[:ids]).destroy_all
     end
     redirect_to assets_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

app/controllers/admin/designs_controller.rb

@@ -114,7 +114,7 @@ class Admin::DesignsController < OrbitBackendController
 
   def delete
     if params[:ids]
-      designs = Design.any_in(:_id => params[:ids]).delete_all
+      designs = Design.any_in(:_id => params[:ids]).destroy_all
     end
     redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

app/controllers/admin/pages_controller.rb

@@ -36,12 +36,11 @@ helper Admin::PagePartsHelper
     
     if @item.module_app
       @module_app = @item.module_app
-	
-	  @frontend_path = @item.app_frontend_url ? @item.app_frontend_url : @module_app.widgets.keys[0]
+      @frontend_path = @item.app_frontend_url
 	  
-	  if @module_app && @module_app.widgets && @module_app.widgets.any?{|b| b.class == Array}
-        @frontend_style =  @module_app.widgets[@frontend_path] if !@frontend_path.blank? && !@module_app.widgets.blank?
-	  end
+  	  if @module_app && @module_app.widgets && @module_app.widgets.any?{|b| b.class == Array}
+          @frontend_style =  @module_app.widgets[@frontend_path] if !@frontend_path.blank? && !@module_app.widgets.blank?
+  	  end
 	  
       case @item.module_app.key
         when 'announcement'
@@ -59,7 +58,7 @@ helper Admin::PagePartsHelper
       end
     else
       @categories = nil
-	  @module_app = @module_apps[0]
+      @module_app = @module_apps[0]
     end
   end
 

app/controllers/admin/plugins_controller.rb

@@ -4,10 +4,20 @@ class Admin::PluginsController < ApplicationController
   
   def index
   
-    @plugins = OrbitApp::Module::Registration.all
+	@plugins = OrbitApp::Plugin::Registration.all
 
     if(!params[:show_plugin_profile].nil?)
-      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary'
+	
+      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).admin_partial_path
+
+	  if !@right_partial.blank?
+	    respond_to do |format|
+	      format.html { redirect_to( @right_partial ) }
+        end
+      else
+	    @right_partial = "admin/users_new_interface/plugin_summary"
+	  end
+	  
     else
       @right_partial = "admin/users_new_interface/plugin_summary"
     end

app/controllers/admin/sub_roles_controller.rb

@@ -1,4 +1,4 @@
-class Admin::SubRolesController < RolesController
+class Admin::SubRolesController < Admin::RolesController
   
   
 end