fix bugs with token
This commit is contained in:
1 parent
cc550c5745
commit
2e58c63ff7
8 files changed
+31
-12
No files matched your search
@@ -10,7 +10,6 @@ class OrbitBackendController< ApplicationController
|
||||
def setup_vars
|
||||
@app_title = request.fullpath.split('/')[2]
|
||||
@module_app = ModuleApp.first(conditions: {:key => @app_title} )
|
||||
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
class ModuleApp
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
include OrbitCoreLib::ObjectTokenUnility
|
||||
|
||||
field :key
|
||||
field :title
|
||||
@@ -14,7 +15,7 @@ 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
|
||||
|
||||
@@ -81,5 +82,6 @@ class ModuleApp
|
||||
def set_key
|
||||
self.key = self.title.underscore if self.title
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
@@ -1,5 +1,5 @@
|
||||
class ObjectAuth < PrototypeAuth
|
||||
|
||||
include OrbitCoreLib::ObjectTokenUnility
|
||||
belongs_to :obj_authable, polymorphic: true
|
||||
# > - Something.find_with_auth(query)
|
||||
# > - or Something.find(query).auth
|
||||
|
||||
@@ -4,7 +4,6 @@ class PrototypeAuth
|
||||
# after_save :update_block_list,:update_privilage_list
|
||||
|
||||
field :title
|
||||
field :token
|
||||
field :all ,type: Boolean,default: false
|
||||
|
||||
belongs_to :users
|
||||
@@ -12,12 +11,13 @@ class PrototypeAuth
|
||||
has_and_belongs_to_many :blocked_users, :inverse_of => nil, :class_name => "User"
|
||||
has_and_belongs_to_many :privilege_users, :inverse_of => nil, :class_name => "User"
|
||||
|
||||
|
||||
has_and_belongs_to_many :roles
|
||||
has_and_belongs_to_many :sub_roles
|
||||
|
||||
attr_protected :roles,:sub_roles,:privilege_users,:blocked_users
|
||||
|
||||
|
||||
|
||||
def add_role role
|
||||
add_operation(:roles,role)
|
||||
end
|
||||
@@ -87,7 +87,6 @@ class PrototypeAuth
|
||||
auth_users_before_block_list - self.blocked_users
|
||||
end
|
||||
|
||||
# protected
|
||||
|
||||
|
||||
end
|
||||
@@ -1,5 +1,7 @@
|
||||
<div id="user_role_management">
|
||||
<h1>User Role</h1>
|
||||
All User
|
||||
|
||||
<%= form_tag(submit_url) do %>
|
||||
<%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %>
|
||||
<%= submit_tag 'Add Role' %><br/>
|
||||
@@ -10,7 +12,6 @@
|
||||
<%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %>
|
||||
<%= submit_tag 'Add BlockedList' %><br/>
|
||||
<% end %>
|
||||
<ul>Roles </ul>
|
||||
<% unless auth.nil? %>
|
||||
<% auth.roles.each do |role| %>
|
||||
<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %>
|
||||
|
||||
Reference in new issue
Block a user