Merge branch 'design_team' into ldap
Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
This commit is contained in:
commit
f1c8bed29d
76 files changed
+348
-171
No files matched your search
@@ -32,7 +32,11 @@ module OrbitCoreLib
|
||||
end
|
||||
|
||||
def get_object_auth_by_title(title)
|
||||
self.object_auths.where({title: title }).first
|
||||
oa = self.object_auths.where({title: title }).first
|
||||
if oa.nil? && (self.class::ObjectAuthTitlesOptions.include? title)
|
||||
oa = self.object_auths.create title: title
|
||||
end
|
||||
oa
|
||||
end
|
||||
|
||||
def authed_users(title=nil)
|
||||
|
||||
Reference in new issue
Block a user