change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.

app/controllers/admin/module_apps_controller.rb

@@ -101,7 +101,7 @@ class Admin::ModuleAppsController < ApplicationController
     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
+      render :nothing => true, :status => 403 
   end
   
   
@@ -113,7 +113,7 @@ class Admin::ModuleAppsController < ApplicationController
     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
+      render :nothing => true, :status => 403 
   end
   
 end

app/controllers/admin/object_auths_controller.rb

@@ -27,8 +27,13 @@ class Admin::ObjectAuthsController < ApplicationController
   
   def create
     obj = eval(params[:object_auth][:type]).find params[:object_auth][:obj_id]
-    @object_auth=obj.object_auths.create :title=> params[:object_auth][:title]
+    @object_auth=obj.object_auths.build :title=> params[:object_auth][:title]
-    redirect_to edit_admin_object_auth_path(@object_auth)
+    if @object_auth.save
+      redirect_to edit_admin_object_auth_path(@object_auth)
+    else
+      flash[:error] = t('admin.object.a_object_must_have_only_one_object_auth_profile_for_each_action')
+      redirect_to (:back)
+    end
   end
 
   def create_role

app/models/object_auth.rb

@@ -1,5 +1,6 @@
 class ObjectAuth  < PrototypeAuth
   include OrbitCoreLib::ObjectTokenUnility
+  validates_uniqueness_of :obj_authable_type,:scope => :title #{ |c| }
   belongs_to :obj_authable, polymorphic: true
   # > - Something.find_with_auth(query)
   # > - or Something.find(query).auth

app/views/admin/components/_user_role_management.html.erb

@@ -1,7 +1,7 @@
 <div id="open_for_all_user">
 	<h1>All User</h1>
 	<%= form_tag(submit_url) do %>
-	<%= check_box_tag 'auth_all',true,auth.all  %><%= submit_tag 'Add Role' %><br/>
+	<%= check_box_tag 'auth_all',true,(auth.all rescue true)  %><%= submit_tag 'Add Role' %><br/>
 	<% end %>
 </div>
 

lib/tasks/user.rake

@@ -5,7 +5,7 @@ namespace :user 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 }
+    userfirstname_list_en = %w{ UserOne UserTwo Thre For Fiv Six Sen }
     userlastname_list_en = %w{ Aa Bb Cc Dd Ee Ff Gg }
     
     userfirstname_list_ct = %w{  一一 二二 三三 四四 五五 六六 七七 }

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -145,7 +145,12 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
   protected
   
   def get_categorys(id = nil)
-    @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+    @bulletin_categorys = []
+    if(is_manager? || is_admin?)
+      @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+    elsif is_sub_manager?
+      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
+    end
   end
 
   def get_sorted_bulletins

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb

@@ -1,10 +1,18 @@
 class Panel::Announcement::BackEnd::FactChecksController  < OrbitBackendController
   before_filter :authenticate_user!
+  include AdminHelper
   layout 'admin'
   
   def index
-    @bulletin_categorys_preview = BulletinCategory.authed_for_user(current_user,'preview')
+    @bulletin_categorys_submit_new = []
-    @bulletin_categorys_check = BulletinCategory.authed_for_user(current_user,'fact_check')
+    @bulletin_categorys_check =[]
+    if is_admin? || is_manager?
+      #@bulletin_categorys_submit_new = BulletinCategory.all
+      @bulletin_categorys_check = BulletinCategory.all
+    # elsif is_sub_manager?
+    #   @bulletin_categorys_submit_new = BulletinCategory.authed_for_user(current_user,'submit_new')
+    #   @bulletin_categorys_check = BulletinCategory.authed_for_user(current_user,'fact_check')
+    end
   end
   
   def new

vendor/built_in_modules/announcement/app/models/bulletin_category.rb

@@ -5,7 +5,7 @@ class BulletinCategory
   include Mongoid::Timestamps
   include OrbitCoreLib::ObjectAuthable
   
-  ObjectAuthTitlesOptions = %W{preview fact_check}
+  ObjectAuthTitlesOptions = %W{submit_new fact_check}
   AfterObjectAuthUrl = '/panel/announcement/back_end/bulletin_categorys'
   # include Mongoid::MultiParameterAttributes
   

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb

@@ -1,22 +1,17 @@
 <% content_for :secondary do %>
-<br />
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%#= link_to t('bulletin_category.new_announcement_class'), new_panel_announcement_back_end_bulletin_category_path, :class => 'seclink1' %></li>
-  </ul>
 <% end -%>
 
 <%= flash_messages %>
 
+<br />
+<br />
+<br />
+<br />
+<br />
+
 <h1><%= t('bulletin_category.list_announcement_class') %></h1>
-<br />
+
-<br />
-<br />
-<br />
-<br />
 <table id="bulletin_categorys">
   <tr>
     <th><%= t('bulletin_category.key') %></th>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.html.erb

@@ -1,15 +1,15 @@
-<br />
-<br />
-<br />
-<br />
-
 <% content_for :secondary do %>
-  <ul class="list">
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-	  <li><%= link_to t('bulletin_category.index'), panel_announcement_back_end_bulletin_categorys_path, :class => 'seclink2' %></li>
-  </ul>
 <% end -%>
 
 <%= flash_messages %>
+
+<br />
+<br />
+<br />
+<br />
+<br />
+
 <h1><%= t('bulletin_category.new_announcement_class') %></h1>
 <%= form_for @bulletin_category, :url => panel_announcement_back_end_bulletin_categorys_path do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb

@@ -1,4 +1,4 @@
-]<%= render 'filter' %>
+<%= render 'filter' %>
 <table id="bulettin_sort_list" class="table main-list">
 	<%= render 'bulletins' %>
 </table>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb

@@ -1,4 +1,3 @@
-
 <%= form_for @bulletin, :url => panel_announcement_back_end_bulletins_path do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb

@@ -1,10 +1,14 @@
-<% # encoding: utf-8 %>
+<% content_for :secondary do %>
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
+<% end -%>
+
+<%= flash_messages %>
 
 <br />
 <br />
 <br />
-
+<br />
-<p id="notice"><%= flash_messages %></p>
+<br />
 
 <ul>
 	<li>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb

@@ -1,16 +1,5 @@
 <% content_for :secondary do %>
-<br />
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%= link_to t('bulletin.new_announcement'), new_panel_announcement_back_end_bulletin_path %></li>
-	  <li><%= link_to t('bulletin.announcement_list'), panel_announcement_back_end_bulletins_path %></li>
-	  <li><%= link_to t('bulletin.new_announcement_class'), panel_announcement_back_end_bulletin_categorys_path %></li>
-	  <li><%= link_to t('bulletin.my_announcement_fact_check'), panel_announcement_back_end_fact_checks_path %></li>
-	
-  </ul>
 <% end -%>
 
 <%= flash_messages %>
@@ -42,11 +31,7 @@
 <br />
 
 <h1><%= t('bulletin.list_announcement') %></h1>
-<div id="preview_block">
+
-	<h1>Preview</h1>
-	<%= render :partial => "list_table", :collection => @bulletin_categorys_preview,:as => :bulletin_category%>
-</div>
-===================================================================================================================
 <div id="check_block">	
 	<h1>Check Please</h1>
 	<%= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%>

vendor/built_in_modules/announcement/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
       namespace :back_end do
         match 'public' => "announcements#public",:as => :public
         resources :fact_checks
+        match 'list_mine' => "announcements#list_mine"
         root :to => "bulletins#index"
         resources :bulletins
         resources :bulletin_categorys, :controller => 'bulletin_categorys' do