From 42c89220e3b73d43efcfbe5466aa826e25caa1b0 Mon Sep 17 00:00:00 2001 From: Matthew Fu Date: Fri, 13 Jan 2012 18:20:04 +0800 Subject: [PATCH 1/6] Manger and SubManager --- app/controllers/admin/app_auths_controller.rb | 6 +++ .../admin/module_apps_controller.rb | 53 +++++++++++++++++++ app/controllers/application_controller.rb | 2 +- app/models/app_manager.rb | 12 +++++ app/models/module_app.rb | 37 +++++++++++++ app/models/user/user.rb | 3 ++ app/views/admin/module_apps/edit.html.erb | 41 ++++++++++++++ config/routes.rb | 5 ++ 8 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 app/models/app_manager.rb create mode 100644 app/views/admin/module_apps/edit.html.erb diff --git a/app/controllers/admin/app_auths_controller.rb b/app/controllers/admin/app_auths_controller.rb index e925b857..6cbbf62e 100644 --- a/app/controllers/admin/app_auths_controller.rb +++ b/app/controllers/admin/app_auths_controller.rb @@ -15,4 +15,10 @@ class Admin::AppAuthsController < ApplicationController @module_apps = ModuleApp.all end + def edit + @module_app = ModuleApp.find(params[:id]) + end + + + end \ No newline at end of file diff --git a/app/controllers/admin/module_apps_controller.rb b/app/controllers/admin/module_apps_controller.rb index 142830f1..34fcf1fd 100644 --- a/app/controllers/admin/module_apps_controller.rb +++ b/app/controllers/admin/module_apps_controller.rb @@ -18,6 +18,7 @@ class Admin::ModuleAppsController < ApplicationController end + def update @module_app = ModuleApp.find(params[:id]) unless params['module_app']['enable_frontend'].nil? @@ -30,4 +31,56 @@ class Admin::ModuleAppsController < ApplicationController format.js { render 'admin/attributes/toggle_enable' } end end + + def assign_sub_manager + @module_app = ModuleApp.find(params[:id]) + @assign_to_user = User.find params[:sub_manager_id] rescue nil + unless @assign_to_user.nil? + if @module_app.assign_sub_manager(@assign_to_user,current_user) + flash[:notice] = t('admin.app_auth.assign_success_sub_manager') + else + flash[:notice] = t('admin.app_auth.assign_fail_sub_manager') + end + else + flash[:notice] = t('admin.app_auth.assign_fail_sub_manager_no_user') + end + redirect_to :action => "edit" + end + + def assign_manager + @module_app = ModuleApp.find(params[:id]) + @assign_to_user = User.find params[:manager_id] rescue nil + unless @assign_to_user.nil? + if @module_app.assign_manager(@assign_to_user,current_user) + flash[:notice] = t('admin.app_auth.assign_success_manager') + else + flash[:notice] = t('admin.app_auth.assign_fail_manager') + end + else + flash[:notice] = t('admin.app_auth.assign_fail_manager_no_user') + end + redirect_to :action => "edit" + end + + def remove_manager + @module_app = ModuleApp.find(params[:id]) + @app_manager = AppManager.find(params[:app_manager_id]) rescue nil + if @module_app.remove_manager(@app_manager.user) + flash[:notice] = t('admin.app_auth.delete_success_manager') + else + flash[:notice] = t('admin.app_auth.delete_fail_manager') + end + redirect_to :action => "edit" + end + + def remove_sub_manager + @module_app = ModuleApp.find(params[:id]) + @app_sub_manager = AppManager.find(params[:app_sub_manager_id]) rescue nil + if @module_app.remove_sub_manager(@app_sub_manager.user) + flash[:notice] = t('admin.app_auth.delete_success_sub_manager') + else + flash[:notice] = t('admin.app_auth.delete_fail_sub_manager') + end + redirect_to :action => "edit" + end end \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0227c252..4bd847c7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base def front_end_available(module_app_title='') app_controller = ModuleApp.first(conditions: {:title => module_app_title} ) unless app_controller.enable_frontend? - render :nothing + render :nothing => true end end diff --git a/app/models/app_manager.rb b/app/models/app_manager.rb new file mode 100644 index 00000000..46cbbb91 --- /dev/null +++ b/app/models/app_manager.rb @@ -0,0 +1,12 @@ +class AppManager + include Mongoid::Document + include Mongoid::Timestamps + + belongs_to :user + + belongs_to :managing_app, :polymorphic => true #,:class_name => 'ModuleApp',:inverse_of => :managers,:foreign_key => "user_id" + belongs_to :sub_managing_app, :polymorphic => true #,:class_name => 'ModuleApp',:inverse_of => :sub_manager,:foreign_key => "sub_user_id" + + belongs_to :rule_creator,:class_name => 'User' + +end \ No newline at end of file diff --git a/app/models/module_app.rb b/app/models/module_app.rb index 18e8a6d7..d02a1cd4 100644 --- a/app/models/module_app.rb +++ b/app/models/module_app.rb @@ -14,8 +14,45 @@ 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 + has_one :app_auth,dependent: :delete + + def assign_manager(user,assigner) + manager = AppManager.first(conditions: {managing_app_id: self.id,user_id: user.id}) rescue nil + if manager.nil? + manager = self.managers.create(:user => user,:rule_creator => assigner) + end + manager + end + + def assign_sub_manager(user,assigner) + submanager = AppManager.first(conditions: {sub_managing_app_id: self.id,user_id: user.id}) rescue nil + if submanager.nil? + submanager = self.sub_managers.create(:user => user,:rule_creator => assigner) + end + submanager + end + + def remove_manager(user) + manager = AppManager.first(conditions: {managing_app_id: self.id,user_id: user.id}) rescue nil + if manager + manager.destroy + else + false + end + end + + def remove_sub_manager(user) + submanager = AppManager.first(conditions: {sub_managing_app_id: self.id,user_id: user.id}) rescue nil + if submanager + submanager.destroy + else + false + end + end end diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 60199ce7..13d282bb 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -14,6 +14,9 @@ class User 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" + belongs_to :role has_and_belongs_to_many :sub_roles accepts_nested_attributes_for :attribute_values, :allow_destroy => true diff --git a/app/views/admin/module_apps/edit.html.erb b/app/views/admin/module_apps/edit.html.erb new file mode 100644 index 00000000..ff967273 --- /dev/null +++ b/app/views/admin/module_apps/edit.html.erb @@ -0,0 +1,41 @@ +<% content_for :secondary do %> +<% end %> + + +
+
+
+ + +
+

<%= @module_app.title %>

+
+
Manager + <% @module_app.managers.each do |manager| %> +
<%= manager.user.name %> -AuthBy:<%= manager.rule_creator.name %> <%= link_to '[X]',remove_manager_admin_module_app_path(@module_app,manager),:method => :delete unless manager.user == current_user%>
+ <% end %> +
Add: + <%= form_tag(assign_manager_admin_module_app_path) do %> + <%= text_field_tag 'manager_id' %> + <%= submit_tag 'Add Manager' %> + <% end %> +
+
+ + +
+
Sub Manager + <% @module_app.sub_managers.each do |manager| %> +
<%= manager.user.name %> -AuthBy:<%= manager.rule_creator.name %> <%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete unless manager.user == current_user%>
+ <% end %> +
Add: + <%= form_tag(assign_sub_manager_admin_module_app_path) do %> + <%= text_field_tag 'sub_manager_id' %> + <%= submit_tag 'Add Sub Manager' %> + <% end %> +
+
+ + +
+ diff --git a/config/routes.rb b/config/routes.rb index f2b4cc17..e0e9eec2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -40,6 +40,11 @@ PrototypeR4::Application.routes.draw do end resources :module_apps do member do + match 'assign_manager' ,:action=> 'assign_manager',:via => "post",:as =>:assign_manager + match 'assign_sub_manager' ,:action=> 'assign_sub_manager',:via => "post",:as =>:assign_sub_manager + + match 'remove_manager/:app_manager_id' ,:action=> 'remove_manager',:via => "delete",:as =>:remove_manager + match 'remove_sub_manager/:app_sub_manager_id' ,:action=> 'remove_sub_manager',:via => "delete",:as =>:remove_sub_manager get 'reload_frontend_pages' end end From 1dea9ba156f7da4d5190b173b2e192ccda914148 Mon Sep 17 00:00:00 2001 From: Matthew Fu Date: Mon, 16 Jan 2012 18:52:08 +0800 Subject: [PATCH 2/6] Add methods to work with manager role,add task to build user test data --- .../admin/module_apps_controller.rb | 73 +++++++++++++------ lib/tasks/user.rake | 29 ++++++++ 2 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 lib/tasks/user.rake diff --git a/app/controllers/admin/module_apps_controller.rb b/app/controllers/admin/module_apps_controller.rb index 34fcf1fd..129453b1 100644 --- a/app/controllers/admin/module_apps_controller.rb +++ b/app/controllers/admin/module_apps_controller.rb @@ -1,4 +1,7 @@ class Admin::ModuleAppsController < ApplicationController + before_filter :user_has_manager_privilege?, :only => [ :assign_manager, :remove_manager ] + before_filter :user_has_sub_manager_privilege?, :only => [ :assign_sub_manager, :remove_sub_manager ] + layout "admin" def index @@ -32,55 +35,77 @@ class Admin::ModuleAppsController < ApplicationController end end + def assign_sub_manager - @module_app = ModuleApp.find(params[:id]) - @assign_to_user = User.find params[:sub_manager_id] rescue nil - unless @assign_to_user.nil? - if @module_app.assign_sub_manager(@assign_to_user,current_user) - flash[:notice] = t('admin.app_auth.assign_success_sub_manager') + unless @assign_to_user.nil? + if @module_app.assign_sub_manager(@assign_to_user,current_user) + flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_ok') + else + flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_fail') + end else - flash[:notice] = t('admin.app_auth.assign_fail_sub_manager') - end - else - flash[:notice] = t('admin.app_auth.assign_fail_sub_manager_no_user') - end - redirect_to :action => "edit" + flash[:notice] = t('admin.app_auth.assigning_manager.failed_no_user') + end + redirect_to :action => "edit" end + def assign_manager - @module_app = ModuleApp.find(params[:id]) - @assign_to_user = User.find params[:manager_id] rescue nil unless @assign_to_user.nil? if @module_app.assign_manager(@assign_to_user,current_user) - flash[:notice] = t('admin.app_auth.assign_success_manager') + flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_ok') else - flash[:notice] = t('admin.app_auth.assign_fail_manager') + flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_fail') end else - flash[:notice] = t('admin.app_auth.assign_fail_manager_no_user') + flash[:notice] = t('admin.app_auth.assigning_sub_manager.failed_no_user') end redirect_to :action => "edit" end + def remove_manager - @module_app = ModuleApp.find(params[:id]) - @app_manager = AppManager.find(params[:app_manager_id]) rescue nil if @module_app.remove_manager(@app_manager.user) - flash[:notice] = t('admin.app_auth.delete_success_manager') + flash[:notice] = t('admin.app_auth.delete_manager.success') else - flash[:notice] = t('admin.app_auth.delete_fail_manager') + flash[:notice] = t('admin.app_auth.delete_manager.fail') end redirect_to :action => "edit" end + def remove_sub_manager - @module_app = ModuleApp.find(params[:id]) - @app_sub_manager = AppManager.find(params[:app_sub_manager_id]) rescue nil if @module_app.remove_sub_manager(@app_sub_manager.user) - flash[:notice] = t('admin.app_auth.delete_success_sub_manager') + flash[:notice] = t('admin.app_auth.delete_sub_manager.success') else - flash[:notice] = t('admin.app_auth.delete_fail_sub_manager') + flash[:notice] = t('admin.app_auth.delete_sub_manager.fail') end redirect_to :action => "edit" end + + + private + def user_has_manager_privilege? + @module_app = ModuleApp.find(params[:id]) + @assign_to_user = User.find params[:manager_id] rescue nil + if current_user.admin? #only admin can assign app's manager + return + end + #user is not permited to do that + flash[:notice] = t('admin.app_auth.operation_not_permitted') + redirect_to :action => "edit" # [TODO] maybe need to redirect to some other page + end + + + def user_has_sub_manager_privilege? + @module_app = ModuleApp.find(params[:id]) + @assign_to_user = User.find params[:sub_manager_id] rescue nil + if current_user.admin? || @module_app.managers.include?(current_user) #admin or app's manager can assign app's subanager + return + end + #user is not permited to do that + flash[:notice] = t('admin.app_auth.operation_not_permitted') + redirect_to :action => "edit" # [TODO] maybe need to redirect to some other page + end + end \ No newline at end of file diff --git a/lib/tasks/user.rake b/lib/tasks/user.rake new file mode 100644 index 00000000..31ed7c24 --- /dev/null +++ b/lib/tasks/user.rake @@ -0,0 +1,29 @@ +# encoding: utf-8 +namespace :user do + + task :build => :environment do + User.all(conditions: {email: /nor/}).destroy_all + + username_list = %w{nor1 nor2 nor3 nor4 nor5 nor6 nor7} + userfirstname_list_en = %w{ One Two Thre For Fiv Six Sen } + userlastname_list_en = %w{ Aa Bb Cc Dd Ee Ff Gg } + + userfirstname_list_ct = %w{ 一一 二二 三三 四四 五五 六六 七七 } + userlastname_list_ct = %w{ 陳 林 吳 李 鄭 方 王 } + + first_name_field = AttributeField.first(conditions: {key: "first_name"}) + last_name_field = AttributeField.first(conditions: {key: "last_name"}) + major_field = AttributeField.first(conditions: {key: "major"}) + department_field = AttributeField.first(conditions: {key: "department"}) + + stud_role = Role.first(conditions: {key: 'student'}) + + username_list.each_with_index do |username,index| + user = User.create( :email => "#{username}@rulingcom.com", :password => 'password', :password_confirmation => 'password', :admin => false ,:role_id => stud_role.id,:sub_role_ids => [stud_role.sub_roles[Random.rand(stud_role.sub_roles.count-1)].id]) + AttributeValue.create( :user_id => user.id, :attribute_field_id => first_name_field.id, :key => 'first_name', :en => userfirstname_list_en[index], :zh_tw => userfirstname_list_ct[index] ) + AttributeValue.create( :user_id => user.id, :attribute_field_id => last_name_field.id, :key => 'last_name', :en => userlastname_list_en[index], :zh_tw => userlastname_list_ct[index] ) + AttributeValue.create( :user_id => user.id, :attribute_field_id => major_field.id, :key => 'major', :en => 'Information management', :zh_tw => '信息化管理' ) + AttributeValue.create( :user_id => user.id, :attribute_field_id => department_field.id, :key => 'department', :en => 'Computer Science', :zh_tw => '計算機科學' ) + end + end +end From 9fa6131ad301d586065094d422982b6266f9d24d Mon Sep 17 00:00:00 2001 From: Matthew Fu Date: Tue, 17 Jan 2012 16:20:03 +0800 Subject: [PATCH 3/6] First complete with manager and submanager --- app/controllers/admin/app_auths_controller.rb | 10 +++++++--- .../admin/module_apps_controller.rb | 14 +++++++++----- app/helpers/admin/module_app_helper.rb | 19 +++++++++++++++++++ app/models/module_app.rb | 12 +++++++++--- app/views/admin/module_apps/edit.html.erb | 8 ++++---- config/locales/en.yml | 2 ++ config/locales/zh_tw.yml | 2 ++ 7 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 app/helpers/admin/module_app_helper.rb diff --git a/app/controllers/admin/app_auths_controller.rb b/app/controllers/admin/app_auths_controller.rb index 6cbbf62e..1bbb5a2e 100644 --- a/app/controllers/admin/app_auths_controller.rb +++ b/app/controllers/admin/app_auths_controller.rb @@ -1,7 +1,7 @@ class Admin::AppAuthsController < ApplicationController layout "admin" before_filter :authenticate_user! - before_filter :is_admin? +# before_filter :is_admin? ,:only => :index def index # @roles = Role.all.entries @@ -12,13 +12,17 @@ class Admin::AppAuthsController < ApplicationController # obj_auth = obj.send "auth" # [:app_obj => app,:auth_field => obj_auth] # end - @module_apps = ModuleApp.all + if current_user.admin? + @module_apps = ModuleApp.all + else + @module_apps = current_user.managing_apps.collect{|t| t.managing_app} + end end def edit @module_app = ModuleApp.find(params[:id]) end - + end \ No newline at end of file diff --git a/app/controllers/admin/module_apps_controller.rb b/app/controllers/admin/module_apps_controller.rb index 129453b1..914c5138 100644 --- a/app/controllers/admin/module_apps_controller.rb +++ b/app/controllers/admin/module_apps_controller.rb @@ -37,7 +37,7 @@ class Admin::ModuleAppsController < ApplicationController def assign_sub_manager - unless @assign_to_user.nil? + unless @assign_to_user.nil? || @assign_to_user.admin? if @module_app.assign_sub_manager(@assign_to_user,current_user) flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_ok') else @@ -46,12 +46,13 @@ class Admin::ModuleAppsController < ApplicationController else flash[:notice] = t('admin.app_auth.assigning_manager.failed_no_user') end - redirect_to :action => "edit" + flash[:notice] = t('admin.app_auth.can_not_add_this_user') + redirect_to :action => "edit" end def assign_manager - unless @assign_to_user.nil? + unless @assign_to_user.nil? || @assign_to_user.admin? if @module_app.assign_manager(@assign_to_user,current_user) flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_ok') else @@ -60,11 +61,13 @@ class Admin::ModuleAppsController < ApplicationController else flash[:notice] = t('admin.app_auth.assigning_sub_manager.failed_no_user') end - redirect_to :action => "edit" + flash[:notice] = t('admin.app_auth.can_not_add_this_user') + redirect_to :action => "edit" end def remove_manager + @app_manager = AppManager.find(params[:app_manager_id]) if @module_app.remove_manager(@app_manager.user) flash[:notice] = t('admin.app_auth.delete_manager.success') else @@ -75,6 +78,7 @@ class Admin::ModuleAppsController < ApplicationController def remove_sub_manager + @app_sub_manager = AppManager.find(params[:app_sub_manager_id]) if @module_app.remove_sub_manager(@app_sub_manager.user) flash[:notice] = t('admin.app_auth.delete_sub_manager.success') else @@ -100,7 +104,7 @@ class Admin::ModuleAppsController < ApplicationController def user_has_sub_manager_privilege? @module_app = ModuleApp.find(params[:id]) @assign_to_user = User.find params[:sub_manager_id] rescue nil - if current_user.admin? || @module_app.managers.include?(current_user) #admin or app's manager can assign app's subanager + if current_user.admin? || @module_app.managing_users.include?(current_user) #admin or app's manager can assign app's subanager return end #user is not permited to do that diff --git a/app/helpers/admin/module_app_helper.rb b/app/helpers/admin/module_app_helper.rb new file mode 100644 index 00000000..0a636e9c --- /dev/null +++ b/app/helpers/admin/module_app_helper.rb @@ -0,0 +1,19 @@ +module Admin::ModuleAppHelper + + def if_permit_to_delete(item) + case item.downcase + when :manager + current_user.admin? + when :sub_manager + @module_app.managing_users.include?(current_user) || current_user.admin? + end + end + + def if_permit_to_assign(item) + if_permit_to_delete(item) + end + + def get_auth_by(manager_obj) + "-AuthBy: " +( manager_obj.rule_creator==current_user ? t('me') : manager_obj.rule_creator.name) + end +end diff --git a/app/models/module_app.rb b/app/models/module_app.rb index d02a1cd4..70d0d7da 100644 --- a/app/models/module_app.rb +++ b/app/models/module_app.rb @@ -19,11 +19,17 @@ class ModuleApp has_one :app_auth,dependent: :delete - + def managing_users + self.managers.collect{ |t| t.user } + end + + def sub_managing_users + self.sub_managers.collect{ |t| t.user } + end def assign_manager(user,assigner) manager = AppManager.first(conditions: {managing_app_id: self.id,user_id: user.id}) rescue nil - if manager.nil? + if manager.nil? manager = self.managers.create(:user => user,:rule_creator => assigner) end manager @@ -31,7 +37,7 @@ class ModuleApp def assign_sub_manager(user,assigner) submanager = AppManager.first(conditions: {sub_managing_app_id: self.id,user_id: user.id}) rescue nil - if submanager.nil? + if submanager.nil? && !self.managing_users.include?(user) submanager = self.sub_managers.create(:user => user,:rule_creator => assigner) end submanager diff --git a/app/views/admin/module_apps/edit.html.erb b/app/views/admin/module_apps/edit.html.erb index ff967273..96859a21 100644 --- a/app/views/admin/module_apps/edit.html.erb +++ b/app/views/admin/module_apps/edit.html.erb @@ -12,11 +12,11 @@
Manager <% @module_app.managers.each do |manager| %> -
<%= manager.user.name %> -AuthBy:<%= manager.rule_creator.name %> <%= link_to '[X]',remove_manager_admin_module_app_path(@module_app,manager),:method => :delete unless manager.user == current_user%>
+
<%= manager.user.name %> <%= get_auth_by(manager) %> <%= link_to '[X]',remove_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:manager) && manager.user != current_user %>
<% end %>
Add: <%= form_tag(assign_manager_admin_module_app_path) do %> - <%= text_field_tag 'manager_id' %> + <%= text_field_tag 'manager_id','Enter User ID here',:disabled => !if_permit_to_assign(:manager)%> <%= submit_tag 'Add Manager' %> <% end %>
@@ -26,11 +26,11 @@
Sub Manager <% @module_app.sub_managers.each do |manager| %> -
<%= manager.user.name %> -AuthBy:<%= manager.rule_creator.name %> <%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete unless manager.user == current_user%>
+
<%= manager.user.name %> -AuthBy:<%= manager.rule_creator.name %> <%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %>
<% end %>
Add: <%= form_tag(assign_sub_manager_admin_module_app_path) do %> - <%= text_field_tag 'sub_manager_id' %> + <%= text_field_tag 'sub_manager_id','Enter User ID here',:disabled => !if_permit_to_assign(:sub_manager)%> <%= submit_tag 'Add Sub Manager' %> <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index f9d77062..c44d2359 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,6 +5,8 @@ en: _locale: English + me: Me + add: Add back: Back create: Create diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 5034ce8a..c1d0552c 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -2,6 +2,8 @@ zh_tw: _locale: 中文 + me: 我 + add: 新增 back: 回去 create: 創造 From 37b8b8555421cf8a9cca7026718a472e762af899 Mon Sep 17 00:00:00 2001 From: Matthew Fu Date: Wed, 18 Jan 2012 11:51:38 +0800 Subject: [PATCH 4/6] put setup APP var setup into Orbit class --- app/controllers/obit_frontend_component_controller.rb | 6 ++++++ .../panel/new_blog/front_end/posts_controller.rb | 8 -------- .../controllers/panel/new_blog/widget/posts_controller.rb | 8 -------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/app/controllers/obit_frontend_component_controller.rb b/app/controllers/obit_frontend_component_controller.rb index d5bfaac6..06bb06a5 100644 --- a/app/controllers/obit_frontend_component_controller.rb +++ b/app/controllers/obit_frontend_component_controller.rb @@ -1,4 +1,10 @@ class ObitFrontendComponentController< ApplicationController + before_filter :setup_vars before_filter {|c| c.front_end_available(@app_title)} layout 'production' + + def setup_vars + @app_title = request.fullpath.split('/')[2] + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb index 2471e5fd..1aeb34b2 100644 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb +++ b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb @@ -1,14 +1,6 @@ class Panel::NewBlog::FrontEnd::PostsController < ObitFrontendController - - - def initialize - super - @app_title = NewBlog::MOUDLEAPP_TITLE - end - # GET /posts # GET /posts.xml - def index @posts = Post.all end diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb index 796155bc..dab532ee 100644 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb +++ b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb @@ -1,12 +1,4 @@ class Panel::NewBlog::Widget::PostsController < ObitWidgetController - - layout 'production' - - def initialize - super - @app_title = NewBlog::MOUDLEAPP_TITLE - end - # GET /posts # GET /posts.xml def index From f1a3008e2b125b41756c680ea7f32d4e431d4f71 Mon Sep 17 00:00:00 2001 From: Matthew Fu Date: Wed, 18 Jan 2012 12:04:01 +0800 Subject: [PATCH 5/6] update app package for previous commit --- lib/NewBlog.zip | Bin 53327 -> 53345 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/NewBlog.zip b/lib/NewBlog.zip index 3513cabf8668eed283bebaac3103fd657c43901e..71f0e09101e32b59c1c13c6bc32357663d03d909 100644 GIT binary patch delta 7922 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 fNZRM4c~<@vn1mf=Bjr>%}uMr^c$;m*Dms@L9>3 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 l Date: Thu, 19 Jan 2012 17:47:52 +0800 Subject: [PATCH 6/6] User role and sub_role simple interface complete --- app/controllers/admin/app_auths_controller.rb | 43 ++++++++++++++++++ .../admin/module_apps_controller.rb | 5 +-- app/views/admin/module_apps/edit.html.erb | 44 +++++++++++++++---- config/routes.rb | 8 +++- 4 files changed, 88 insertions(+), 12 deletions(-) diff --git a/app/controllers/admin/app_auths_controller.rb b/app/controllers/admin/app_auths_controller.rb index 1bbb5a2e..cb3340fd 100644 --- a/app/controllers/admin/app_auths_controller.rb +++ b/app/controllers/admin/app_auths_controller.rb @@ -19,6 +19,49 @@ class Admin::AppAuthsController < ApplicationController end end + def create + app_auth = AppAuth.find_or_create_by(module_app_id: params[:module_app_id]) + params[:new].each do |item| + field = item[0] + field_value = item[1] + if field_value!='' + case field + when 'role' + app_auth.send("add_#{field}",(Role.find field_value)) rescue nil + when 'sub_role' + app_auth.send("add_#{field}",(SubRole.find field_value)) rescue nil + when 'privilege_user' + app_auth.add_user_to_privilege_list (User.find field_value) rescue nil + when 'blocked_user' + app_auth.add_user_to_black_list (User.find field_value) rescue nil + end + end + end + app = ModuleApp.find params[:module_app_id] rescue nil + redirect_to edit_admin_module_app_path(app) + end + + def remove + app_auth = AppAuth.find( params[:id] ) + type = params[:type] + field_value = params[:target_id] + if field_value!='' + case type + when 'role' + app_auth.remove_role(Role.find field_value) rescue nil + when 'sub_role' + app_auth.remove_sub_role(SubRole.find field_value) rescue nil + when 'privilege_user' + app_auth.remove_user_from_privilege_list (User.find field_value) rescue nil + when 'blocked_user' + app_auth.remove_user_from_black_list (User.find field_value) rescue nil + end + end + + app = ModuleApp.find params[:module_app_id] rescue nil + redirect_to edit_admin_module_app_path(app) + end + def edit @module_app = ModuleApp.find(params[:id]) end diff --git a/app/controllers/admin/module_apps_controller.rb b/app/controllers/admin/module_apps_controller.rb index 914c5138..56c2523f 100644 --- a/app/controllers/admin/module_apps_controller.rb +++ b/app/controllers/admin/module_apps_controller.rb @@ -18,7 +18,6 @@ class Admin::ModuleAppsController < ApplicationController def edit @module_app = ModuleApp.find(params[:id]) - end @@ -91,7 +90,7 @@ class Admin::ModuleAppsController < ApplicationController private def user_has_manager_privilege? @module_app = ModuleApp.find(params[:id]) - @assign_to_user = User.find params[:manager_id] rescue nil + @assign_to_user = User.find params[:manager][:id] rescue nil if current_user.admin? #only admin can assign app's manager return end @@ -103,7 +102,7 @@ class Admin::ModuleAppsController < ApplicationController def user_has_sub_manager_privilege? @module_app = ModuleApp.find(params[:id]) - @assign_to_user = User.find params[:sub_manager_id] rescue nil + @assign_to_user = User.find params[:sub_manager][:id] rescue nil if current_user.admin? || @module_app.managing_users.include?(current_user) #admin or app's manager can assign app's subanager return end diff --git a/app/views/admin/module_apps/edit.html.erb b/app/views/admin/module_apps/edit.html.erb index 96859a21..9429e963 100644 --- a/app/views/admin/module_apps/edit.html.erb +++ b/app/views/admin/module_apps/edit.html.erb @@ -6,9 +6,11 @@

+

<%= @module_app.title %>

-

<%= @module_app.title %>

+

Manager

+
Manager <% @module_app.managers.each do |manager| %> @@ -16,13 +18,11 @@ <% end %>
Add: <%= form_tag(assign_manager_admin_module_app_path) do %> - <%= text_field_tag 'manager_id','Enter User ID here',:disabled => !if_permit_to_assign(:manager)%> + <%= collection_select(:manager,:id, User.all, :id, :name, :prompt => true,:disabled => !if_permit_to_assign(:manager))%> <%= submit_tag 'Add Manager' %> <% end %>
- -
Sub Manager <% @module_app.sub_managers.each do |manager| %> @@ -30,12 +30,40 @@ <% end %>
Add: <%= form_tag(assign_sub_manager_admin_module_app_path) do %> - <%= text_field_tag 'sub_manager_id','Enter User ID here',:disabled => !if_permit_to_assign(:sub_manager)%> + <%= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled => !if_permit_to_assign(:sub_manager))%> <%= submit_tag 'Add Sub Manager' %> <% end %>
- -
- +
+

User Role

+ <%= form_tag(admin_module_app_app_auths_path(@module_app),:method => :post) do %> + <%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %> + <%= submit_tag 'Add Role' %>
+ <%= collection_select(:new,:sub_role, SubRole.all, :id, :key, :prompt => true) %> + <%= submit_tag 'Add SubRole' %>
+ <%= collection_select(:new,:privilege_user, User.all, :id, :name, :prompt => true) %> + <%= submit_tag 'Add PrivilegeList' %>
+ <%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %> + <%= submit_tag 'Add BlockedList' %>
+ <% end %> +
    Roles
+ <% unless @module_app.app_auth.nil? %> + <% @module_app.app_auth.roles.each do |role| %> +
  • <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %> <%= link_to '[X]',remove_admin_module_app_app_auth_path(@module_app,@module_app.app_auth,'role',role),:method => :delete %>
    • + <% end %> +
      Sub Roles
    + <% @module_app.app_auth.sub_roles.each do |role| %> +
  • <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %>
    • <%= link_to '[X]',remove_admin_module_app_app_auth_path(@module_app,@module_app.app_auth,'sub_role',role),:method => :delete %> + <% end %> +
      PrivilegeList
    + <% @module_app.app_auth.privilege_users.each do |user| %> +
  • <%= user.name %> <%= link_to '[X]',remove_admin_module_app_app_auth_path(@module_app,@module_app.app_auth,'privilege_user',user),:method => :delete %>
    • + <% end %> +
      BlockedList
    + <% @module_app.app_auth.blocked_users.each do |user| %> +
  • <%= user.name %><%= link_to '[X]',remove_admin_module_app_app_auth_path(@module_app,@module_app.app_auth,'blocked_user',user),:method => :delete %>
    • + <% end %> +<% end %> +
    diff --git a/config/routes.rb b/config/routes.rb index e0e9eec2..efa64576 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,7 @@ PrototypeR4::Application.routes.draw do # routes for admin namespace :admin do resources :assets - resources :app_auths + resources :app_auths resources :designs do collection do @@ -39,6 +39,12 @@ PrototypeR4::Application.routes.draw do end end resources :module_apps do + resources :app_auths do + member do + match 'remove/:type/:target_id' ,:action=> 'remove',:via => "delete",:as =>:remove + end + end + member do match 'assign_manager' ,:action=> 'assign_manager',:via => "post",:as =>:assign_manager match 'assign_sub_manager' ,:action=> 'assign_sub_manager',:via => "post",:as =>:assign_sub_manager