Import Announcements, Journal Paper, Conference Data, book data

Conflicts:
	app/models/user/user.rb
This commit is contained in:
saurabhbhatia committed 2013-09-17 11:36:05 +08:00
1 parent 93909eeca0
commit d2a07d9ffb
3 files changed
+193 -44

No files matched your search

+2
View File
@@ -18,6 +18,8 @@ class User
field :office_tel
field :cache_dept,type: Hash
field :status_record,type: Hash
field :ntu_seq
#validates :ntu_seq, :uniqueness => true
has_and_belongs_to_many :approving_apps, class_name: 'AuthApproval', inverse_of: 'authorized_users'
has_and_belongs_to_many :managing_apps, class_name: 'AuthManager', inverse_of: 'authorized_users'