Migrate form old ui to new ui (categories, tags and authorizations)

app/controllers/admin/authorizations_controller.rb

@@ -34,38 +34,30 @@ class Admin::AuthorizationsController < OrbitBackendController
   end
 
   def add_roles
-    roles = Role.find(params[:role_ids]) rescue []
-    users = []
-    roles.each do |role|
-      users += role.users.all.entries
-    end
-    unless roles.blank?
+    roles = Role.find(params[:role_ids]) rescue nil
+    unless roles.nil?
       authorization = get_or_create_authorization
-      add_roles_to_auth(authorization, roles) unless @error
+      add_roles_to_auth(authorization, roles)
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
   end
 
   def add_sub_roles
-    sub_roles = SubRole.find(params[:sub_role_ids]) rescue []
-    users = []
-    sub_roles.each do |sub_role|
-      users += sub_role.users.all.entries
-    end
-    unless sub_roles.blank?
+    sub_roles = SubRole.find(params[:sub_role_ids]) rescue nil
+    unless sub_roles.nil?
       authorization = get_or_create_authorization
-      add_sub_roles_to_auth(authorization, sub_roles) unless @error
+      add_sub_roles_to_auth(authorization, sub_roles)
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
   end
 
   def add_users
-    users = User.find(params[:user_ids]) rescue []
-    unless users.blank?
+    users = User.find(params[:user_ids]) rescue nil
+    unless users.nil?
       authorization = get_or_create_authorization
-      add_users_to_auth(authorization, users) unless @error
+      add_users_to_auth(authorization, users)
     end
     @users = authorization.authorized_users
     render 'admin/authorizations/reload_users'
@@ -120,10 +112,6 @@ class Admin::AuthorizationsController < OrbitBackendController
   
   protected
 
-  def add_managers_to_auth(users)
-    @module_app.add_managers(users)
-  end
-
   def add_roles_to_auth(authorization, roles)
     authorization.add_roles(roles)
   end
@@ -151,7 +139,7 @@ class Admin::AuthorizationsController < OrbitBackendController
         @error = t(:no_data)
       end
     when nil
-      @module_app.auth_manager || @module_app.create_auth_manager(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}")
+      @module_app.auth_manager || @module_app.create_auth_manager(module_app_id: @module_app.id, title: @module_app.key)
     else
       auth = @object.get_authorization_by_title("#{@type}_#{@module_app.key}")
       unless auth
@@ -162,10 +150,6 @@ class Admin::AuthorizationsController < OrbitBackendController
     end
   end
 
-  def remove_managers_from_auth(users)
-    @module_app.remove_manager(users)
-  end
-
   def remove_roles_form_auth(authorization, roles)
     authorization.remove_roles(roles)
   end

app/helpers/orbit_backend_helper.rb

@@ -199,7 +199,7 @@ module OrbitBackendHelper
       objects.join(' ')
     else
       objects = Array(objects).map do |object|
-        display_value(object.send(field))
+        display_value(object.send(field)) rescue ''
       end
       objects.join(', ')
     end

app/models/ad_banner.rb

@@ -2,8 +2,8 @@ class AdBanner
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
-  include OrbitCoreLib::ObjectAuthable
   include OrbitTag::Taggable
+  include OrbitModel::Authorizable
 
   field :title
   field :transition_msec,type: Integer

app/models/auth/auth_manager.rb

@@ -1,4 +1,3 @@
 class AuthManager < Authorization
-	# belongs_to :manager_authorizable, polymorphic: true
 	has_and_belongs_to_many :authorized_users, class_name: 'User', inverse_of: 'managing_apps'
 end

app/models/module_app.rb

@@ -7,6 +7,7 @@ class ModuleApp
   field :auth_approval_users, type: Array, default: nil
   field :auth_manager_users, type: Array, default: nil
   field :auth_sub_manager_users, type: Array, default: nil
+  field :has_category, type: Boolean, default: false
   field :key
   field :title
   field :sidebar_order,type: Integer,default: 0
@@ -189,7 +190,8 @@ class ModuleApp
   end
 
   def update_auth_manager_users
-    self.update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
+    users = self.auth_manager_authorized_users
+    self.update_attribute(:auth_manager_users, users.map{|user| user.id}) if users
   end
 
   def update_auth_sub_manager_users
@@ -207,21 +209,6 @@ class ModuleApp
     managers.include?(user)
   end
 
-  def add_managers(users)
-    users = Array(users)
-    if auth_manager = self.auth_manager
-      auth_manager.update_attribute(:authorized_users, (auth_manager.authorized_users + users).uniq)
-    else
-      self.create_auth_manager(authorized_users: users)
-    end
-  end
-
-  def remove_managers(users)
-    users = Array(users)
-    users = users.delete_if{|user| user == current_user || is_admin?}
-    self.auth_manager.update_attribute(:authorized_users, auth_manager.authorized_users - users)
-  end
-
   def is_manager?(user)
     if user && !auth_manager_users.blank?
       auth_manager_users.include?(user.id)

app/models/tag.rb

@@ -1,8 +1,3 @@
-# class Tag < ProtoTag
-#   belongs_to :module_app
-
-# end
-
 class Tag
   include Mongoid::Document
   include Mongoid::Timestamps