From b970ea1e0ebe8f808d2d4f8ee55fc67b49573c6e Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Tue, 27 Aug 2013 10:13:39 +0800
Subject: [PATCH] Updated Authorization for member, link, tag, archive

---
 app/controllers/admin/tags_controller.rb                  | 3 ---
 app/controllers/admin/users_new_interface_controller.rb   | 3 +--
 .../archive/back_end/archive_file_categorys_controller.rb | 7 ++-----
 .../panel/archive/back_end/archive_files_controller.rb    | 8 +-------
 .../panel/ask/front_end/ask_questions/thank_you.html.erb  | 1 +
 .../back_end/writing_book_categorys_controller.rb         | 4 +---
 .../personal_book/back_end/writing_books_controller.rb    | 4 +---
 .../personal_book/plugin/writing_books_controller.rb      | 2 --
 .../back_end/writing_conference_categorys_controller.rb   | 4 +---
 .../back_end/writing_conferences_controller.rb            | 2 --
 .../plugin/writing_conferences_controller.rb              | 2 --
 .../personal_diploma/back_end/diplomas_controller.rb      | 3 ---
 .../panel/personal_diploma/plugin/diplomas_controller.rb  | 3 ---
 .../back_end/experience_categorys_controller.rb           | 4 +---
 .../back_end/experiences_controller.rb                    | 3 +--
 .../personal_experience/plugin/experiences_controller.rb  | 2 --
 .../personal_honor/back_end/honor_categorys_controller.rb | 4 +---
 .../panel/personal_honor/back_end/honors_controller.rb    | 4 +---
 .../panel/personal_honor/plugin/honors_controller.rb      | 3 ---
 .../back_end/writing_journal_categorys_controller.rb      | 4 +---
 .../back_end/writing_journals_controller.rb               | 4 +---
 .../plugin/writing_journals_controller.rb                 | 4 +---
 .../panel/personal_lab/back_end/labs_controller.rb        | 2 --
 .../panel/personal_lab/plugin/labs_controller.rb          | 3 +--
 .../back_end/writing_patent_categorys_controller.rb       | 4 +---
 .../back_end/writing_patents_controller.rb                | 2 --
 .../personal_patent/plugin/writing_patents_controller.rb  | 2 --
 .../back_end/project_categorys_controller.rb              | 6 ++----
 .../personal_project/back_end/projects_controller.rb      | 3 +--
 .../panel/personal_project/plugin/projects_controller.rb  | 2 --
 .../personal_research/back_end/researchs_controller.rb    | 2 --
 .../personal_research/plugin/researchs_controller.rb      | 2 --
 vendor/built_in_modules/tag/init.rb                       | 6 +-----
 .../panel/web_resource/back_end/web_links_controller.rb   | 5 +----
 34 files changed, 22 insertions(+), 95 deletions(-)
 create mode 100644 vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb

diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 7e92c3c3..e4f437f3 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -1,8 +1,5 @@
 class Admin::TagsController < OrbitBackendController
   include OrbitTag::Merging
-
-  before_filter :force_order_for_visitor, only: [:index]
-  before_filter :force_order_for_user, except: [:index]
    
   def index
     @tags = @module_app.module_tags
diff --git a/app/controllers/admin/users_new_interface_controller.rb b/app/controllers/admin/users_new_interface_controller.rb
index 813a8d2e..4be0c605 100644
--- a/app/controllers/admin/users_new_interface_controller.rb
+++ b/app/controllers/admin/users_new_interface_controller.rb
@@ -3,8 +3,7 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
   helper MemberHelper
   
   before_filter :set_attribute,:except => [:index,:show]
-  prepend_filter :set_public, :only => [:index, :show]
-
+  open_for_visitor :only => [:index, :show]
 
   def index
     get_tags
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb
index d96eaa0d..3bb85311 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb
@@ -1,11 +1,8 @@
 class Panel::Archive::BackEnd::ArchiveFileCategorysController < OrbitBackendController  
   include OrbitControllerLib::DivisionForDisable
 
-  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_archive_files_json]
-
-  before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_archive_files_json]
-  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_archive_files_json]
-  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_archive_files_json]
+  open_for_manager :except => [:index,:get_categorys_json,:get_archive_files_json]
+  open_for_sub_manager :except => [:index,:get_categorys_json,:get_archive_files_json]
   
   def index
     @archive_file_categorys =  get_categories_for_index("ArchiveFileCategory")
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
index 10e942a0..5cf588f5 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
@@ -2,13 +2,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
   # before_filter :for_app_manager,:except => [:index,:show] 
   # include OrbitControllerLib::DivisionForDisable
 
-  before_filter :force_order_for_visitor,:only=>[:index]
-  before_filter :force_order_for_user,:except => [:index]
-
-  before_filter :for_app_sub_manager,:except => [:index]
-  # before_filter :only => [ :new,:edit,:update,:create] do |controller|
-  #   controller.get_categorys('ArchiveFileCategory')
-  # end
+  open_for_sub_manager :except => [:index]
 
   before_filter :only => [ :new, :create, :edit, :update ] do |controller|
     @categories = get_categories_for_form
diff --git a/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb b/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb
new file mode 100644
index 00000000..4409fcf6
--- /dev/null
+++ b/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb
@@ -0,0 +1 @@
+<h3>Thank you for your email, we will get back to you soon.</h3>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_book_categorys_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_book_categorys_controller.rb
index 4fb020da..edbe3a8c 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_book_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_book_categorys_controller.rb
@@ -1,9 +1,7 @@
 class Panel::PersonalBook::BackEnd::WritingBookCategorysController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  open_for_manager :except => [:index]
 
   def index
   
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
index 2b612266..60193c41 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
@@ -3,9 +3,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
+
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingBookCategory')
   end
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
index c763539c..a92fdfdc 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingBookCategory')
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conference_categorys_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conference_categorys_controller.rb
index cb27cbda..f8fdbfee 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conference_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conference_categorys_controller.rb
@@ -2,9 +2,7 @@ class Panel::PersonalConference::BackEnd::WritingConferenceCategorysController <
 
   include OrbitControllerLib::DivisionForDisable
 	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  open_for_manager :except => [:index]
 
   def index
   
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
index d5913dba..a91b1407 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingConferenceCategory')
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
index 873828f5..5bb64439 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingConferenceCategory')
diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb
index 507f88ba..45b5ca93 100644
--- a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb
+++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb
@@ -3,9 +3,6 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
   
   def index
   
diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb
index bcc3d68f..ca022e6d 100644
--- a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb
+++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb
@@ -3,9 +3,6 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
   
   def index
   
diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experience_categorys_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experience_categorys_controller.rb
index 19740010..f5a8e16c 100644
--- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experience_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experience_categorys_controller.rb
@@ -1,9 +1,7 @@
 class Panel::PersonalExperience::BackEnd::ExperienceCategorysController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  open_for_manager :except => [:index]
 
   def index
   
diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb
index 322bc8f3..fe15d329 100644
--- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb
+++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb
@@ -3,8 +3,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
+ 
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('ExperienceCategory')
diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb
index ecd658d3..307b7e13 100644
--- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb
+++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('ExperienceCategory')
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honor_categorys_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honor_categorys_controller.rb
index 742cffb0..6ae09194 100644
--- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honor_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honor_categorys_controller.rb
@@ -1,9 +1,7 @@
 class Panel::PersonalHonor::BackEnd::HonorCategorysController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  open_for_manager :except => [:index]
 
   def index
   
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb
index 65412d31..dd749ce1 100644
--- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb
@@ -3,9 +3,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
+ 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('HonorCategory')
   end
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb
index 474780fa..662109d3 100644
--- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb
@@ -3,9 +3,6 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('HonorCategory')
   end
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journal_categorys_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journal_categorys_controller.rb
index 8176a855..cd232c9f 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journal_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journal_categorys_controller.rb
@@ -2,9 +2,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalCategorysController < Orbit
      
   include OrbitControllerLib::DivisionForDisable
 	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  open_for_manager :except => [:indx]
   
   def index
   
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb
index 072e6e98..7ff654f9 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb
@@ -3,9 +3,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
+ 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingJournalCategory')
   end
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb
index 304c7ea7..2b660735 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb
@@ -3,9 +3,7 @@ class Panel::PersonalJournal::Plugin::WritingJournalsController < OrbitBackendCo
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  # before_filter :for_app_manager,:except => [:index,:show] 
+
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingJournalCategory')
   end
diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb
index 0fa938dd..e7f6776c 100644
--- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb
+++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   # before_filter :for_app_manager,:except => [:index,:show] 
   # before_filter :only => [ :new,:edit,:update] do |controller|
     # controller.get_categorys('LabCategory')
diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb
index 3b5e0332..9c1f0e40 100644
--- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb
+++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb
@@ -3,8 +3,7 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
+
   # before_filter :for_app_manager,:except => [:index,:show] 
   # before_filter :only => [ :new,:edit,:update] do |controller|
     # controller.get_categorys('LabCategory')
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
index 7e15b527..35c49693 100644
--- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
@@ -1,9 +1,7 @@
 class Panel::PersonalPatent::BackEnd::WritingPatentCategorysController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
 	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  open_for_manager :except => [:index]
 
   def index
   
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
index 10cc208a..49341619 100644
--- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingPatentCategory')
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
index bf9f428a..79250bf5 100644
--- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendCont
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('WritingPatentCategory')
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/project_categorys_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/project_categorys_controller.rb
index 90b159cc..2e18a19c 100644
--- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/project_categorys_controller.rb
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/project_categorys_controller.rb
@@ -1,9 +1,7 @@
 class Panel::PersonalProject::BackEnd::ProjectCategorysController < OrbitBackendController
   include OrbitControllerLib::DivisionForDisable
-	
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
-  before_filter :for_app_manager,:except => [:index]
+  
+  open_for_manager :except => [:index]
 
   def index
 	
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb
index ff153829..d712a916 100644
--- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb
@@ -3,8 +3,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
+
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:edit,:update] do |controller|
     controller.get_categorys('ProjectCategory')
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb
index 514f9014..bbb79943 100644
--- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalProject::Plugin::ProjectsController < OrbitBackendControlle
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   # before_filter :for_app_manager,:except => [:index,:show] 
   before_filter :only => [ :new,:create,:edit,:update,:create] do |controller|
     controller.get_categorys('ProjectCategory')
diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb
index 5c432a5c..d80f740b 100644
--- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb
+++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
 
   def index
   
diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb
index 35ba17ab..4703d5b1 100644
--- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb
+++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb
@@ -3,8 +3,6 @@ class Panel::PersonalResearch::Plugin::ResearchsController < OrbitBackendControl
   include OrbitControllerLib::DivisionForDisable
   
   before_filter :authenticate_user!
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
 
   def index
 
diff --git a/vendor/built_in_modules/tag/init.rb b/vendor/built_in_modules/tag/init.rb
index a59fb3b6..a35ed65c 100644
--- a/vendor/built_in_modules/tag/init.rb
+++ b/vendor/built_in_modules/tag/init.rb
@@ -8,6 +8,7 @@ module Tag
     # author "RD dep"
     # intro "I am intro"
     # update_info 'some update_info'
+    authorizable
 
     
     side_bar do
@@ -23,11 +24,6 @@ module Tag
         active_for_action: {tags: :index},
         available_for: [:admin, :manager]
 
-      context_link 'module_authorization',
-        link_path: "admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: 'Tag'}))",
-        priority: 2,
-        active_for_app_auth: 'tags',
-        available_for: [:admin]
     end
   end
 end
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
index 7bc0f8d6..3206a882 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
@@ -2,10 +2,7 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
   # include OrbitControllerLib::DivisionForDisable
   # before_filter :for_app_manager,:except => [:index,:show] 
 
-  before_filter :force_order_for_visitor,:only=>[:index]
-  before_filter :force_order_for_user,:except => [:index]
-
-  before_filter :for_app_sub_manager,:except => [:index]
+  open_for_sub_manager :except => [:index]
   # before_filter :only => [ :new,:edit,:update,:create] do |controller|
   #   controller.get_categorys('WebLinkCategory')
   # end