NCCU 上傳版本 0709

Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb

app/models/app_manager.rb

@@ -1,7 +1,7 @@
 class AppManager 
   include Mongoid::Document
   include Mongoid::Timestamps
-  	
+  
   belongs_to :user
   
   belongs_to :managing_app, :polymorphic => true  #,:class_name => 'ModuleApp',:inverse_of => :managers,:foreign_key => "user_id" 

app/models/module_app.rb

@@ -4,7 +4,7 @@ class ModuleApp
   include OrbitCoreLib::ObjectTokenUnility
 
   field :key
-	field :title
+  field :title
   field :version
   field :organization
   field :author
@@ -16,8 +16,8 @@ class ModuleApp
   field :app_pages ,type: Array
   field :widgets ,type: Array
     
-  has_many :managers,as: :managing_app ,:class_name => "AppManager" #,:dependent => :destroy,:foreign_key => "managing_app_id",:inverse_of => :managing_app
-  has_many :sub_managers,as: :sub_managing_app ,:class_name => "AppManager"#, :dependent => :destroy,:foreign_key => "sub_managing_app_id",:inverse_of => :sub_managing_app
+  has_many :managers,as: :managing_app ,:class_name => "AppManager" ,:dependent => :destroy#,:foreign_key => "managing_app_id",:inverse_of => :managing_app
+  has_many :sub_managers,as: :sub_managing_app ,:class_name => "AppManager", :dependent => :destroy#,:foreign_key => "sub_managing_app_id",:inverse_of => :sub_managing_app
   
   has_many :tags
   has_many :page_parts

app/models/user/user.rb

@@ -17,10 +17,10 @@ class User
 
   has_many :attribute_values, :autosave => true, :dependent => :destroy
   has_many :app_auths,as: :privilege_apps,:inverse_of => :privilege_lists
-  has_many :blocked_apps,  :inverse_of => :blocked_users, :class_name => "AppAuth"
-  has_many :privilege_apps,  :inverse_of => :privilege_users, :class_name => "AppAuth"
+  has_many :blocked_apps,  :inverse_of => :blocked_users, :class_name => "AppAuth", :dependent => :destroy
+  has_many :privilege_apps,  :inverse_of => :privilege_users, :class_name => "AppAuth", :dependent => :destroy
   
-  has_many :managing_apps,:class_name => "AppManager"
+  has_many :managing_apps,:class_name => "AppManager", :dependent => :destroy
   
   belongs_to :role
   has_and_belongs_to_many :sub_roles
@@ -72,7 +72,7 @@ class User
     if info
       first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
       last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
-      return "#{first_name} #{last_name}"
+      return "#{last_name} #{first_name}"
     else
       return nil
     end