Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml
This commit is contained in:
commit
b4a2737407
373 files changed
+10342
-6551
No files matched your search
@@ -9,10 +9,7 @@ class User
|
||||
|
||||
field :admin, :type => Boolean, :default => true
|
||||
field :active_role
|
||||
field :nccu_ldap_uid
|
||||
field :email
|
||||
# field :cache_dept
|
||||
# has_one :cache_dept, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
|
||||
field :cache_dept,type: Hash
|
||||
field :status_record,type: Hash
|
||||
|
||||
@@ -180,7 +177,7 @@ class User
|
||||
end
|
||||
|
||||
def initialize_desktop
|
||||
self.build_desktop
|
||||
self.build_desktop(desktop_widget_ids: DesktopWidget.all.collect{|widget| widget.id})
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
Reference in new issue
Block a user