Merge branch 'nccu_master' into demo_site

Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

app/models/user/attribute.rb

@@ -6,9 +6,9 @@ class Attribute
   field :key
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
+  field :title, localize: true
   
   has_many :attribute_fields, :autosave => true, :dependent => :destroy
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :attribute_fields, :allow_destroy => true
   
   def is_built_in?

app/models/user/attribute_field.rb

@@ -9,9 +9,9 @@ class AttributeField
   field :list_options, :type => Array
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
+  field :title, localize: true
   
   belongs_to :attribute
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :attribute_values
   
   # validates_uniqueness_of :key

app/models/user/role.rb

@@ -6,11 +6,10 @@ class Role
   field :key
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
+  field :title, localize: true
   
   has_many :sub_roles, :autosave => true, :dependent => :destroy
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :users
-  accepts_nested_attributes_for :i18n_variable, :allow_destroy => true
   accepts_nested_attributes_for :sub_roles, :allow_destroy => true
   
   def is_built_in?

app/models/user/user.rb

@@ -9,6 +9,7 @@ class User
   
   field :admin, :type => Boolean, :default => true
   field :active_role
+  field :nccu_ldap_uid
   
   # field :cache_dept
   # has_one :cache_dept, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
@@ -16,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 :managing_apps,:class_name => "AppManager"
+  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", :dependent => :destroy
   has_one :desktop, :autosave => true, :dependent => :destroy
   has_many :other_accounts, :autosave => true, :dependent => :destroy
   has_many :journals, :autosave => true, :dependent => :destroy
@@ -27,19 +28,17 @@ class User
 
   belongs_to :role
   has_and_belongs_to_many :sub_roles
-  accepts_nested_attributes_for :attribute_values, :allow_destroy => true
+  accepts_nested_attributes_for :attribute_values, :allow_destroy => true 
+
+  before_create :initialize_desktop
+  scope :remote_account, where(:nccu_id.ne => nil)
 
   def create_dept_cache
     dept_hash = {}
 
     VALID_LOCALES.each  do |loc|
       locale = loc.to_sym
-          # debugger
-      # if(self.cache_dept.nil?)
-      #   self.build_cache_dept key: "dept_cache_user_#{self.id}"
-      # end
-      dept_hash[locale] = sub_roles.collect{|sr| sr.i18n_variable[locale]}.join(',')
-      # self.cache_dept[locale] = sub_roles.collect{|sr| sr.i18n_variable[locale]}.join(',')
+      dept_hash[locale] = sub_roles.collect{|sr| sr.title}.join(',')
     end
     self.cache_dept = dept_hash
     self.save!
@@ -48,13 +47,11 @@ class User
   def self.current
     Thread.current[:user]
   end
-
+   
   def self.current=(user)
      Thread.current[:user] = user
   end
   
-  before_create :initialize_desktop
-  
   def avb_apps
     sub_role_ids_ary=self.sub_roles.collect{|t| t.id}
     query1 = AppAuth.any_in({sub_role_ids: sub_role_ids_ary}).excludes(blocked_user_ids: self.id)
@@ -67,7 +64,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