diff --git a/app/controllers/admin/app_auths_controller.rb b/app/controllers/admin/app_auths_controller.rb
index cb3340fd9..56d0ae23d 100644
--- a/app/controllers/admin/app_auths_controller.rb
+++ b/app/controllers/admin/app_auths_controller.rb
@@ -66,6 +66,8 @@ class Admin::AppAuthsController < ApplicationController
@module_app = ModuleApp.find(params[:id])
end
-
+ def show
+ @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 56c2523fe..a350c28b1 100644
--- a/app/controllers/admin/module_apps_controller.rb
+++ b/app/controllers/admin/module_apps_controller.rb
@@ -20,6 +20,10 @@ class Admin::ModuleAppsController < ApplicationController
@module_app = ModuleApp.find(params[:id])
end
+ def show
+ @module_app = ModuleApp.find(params[:id])
+
+ end
def update
@module_app = ModuleApp.find(params[:id])
diff --git a/app/controllers/admin/object_auths_controller.rb b/app/controllers/admin/object_auths_controller.rb
index ce404e53c..3bff43742 100644
--- a/app/controllers/admin/object_auths_controller.rb
+++ b/app/controllers/admin/object_auths_controller.rb
@@ -14,6 +14,7 @@ class Admin::ObjectAuthsController < ApplicationController
def new
obj = eval(params[:type]).find params[:obj_id]
@object_auth=obj.object_auths.build
+ @object_auth_title_option = eval(params[:type]+"::ObjectAuthTitlesOptions")
respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @post }
diff --git a/app/models/prototype_auth.rb b/app/models/prototype_auth.rb
index 734268c43..893f402b0 100644
--- a/app/models/prototype_auth.rb
+++ b/app/models/prototype_auth.rb
@@ -68,7 +68,7 @@ class PrototypeAuth
end
end
- def auth_users
+ def auth_users_before_block_list
if self.all?
User.all.entries
else
@@ -83,8 +83,8 @@ class PrototypeAuth
end
end
- def auth_users_after_block_list
- auth_users - self.blocked_users
+ def auth_users
+ auth_users_before_block_list - self.blocked_users
end
# protected
diff --git a/app/views/admin/attributes/_app_selector.html.erb b/app/views/admin/attributes/_app_selector.html.erb
new file mode 100644
index 000000000..c20a38858
--- /dev/null
+++ b/app/views/admin/attributes/_app_selector.html.erb
@@ -0,0 +1 @@
+<%= f.select :module_app_id, @apps.collect { |t| [t.title.capitalize, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path } %>
diff --git a/app/views/admin/module_apps/show.html.erb b/app/views/admin/module_apps/show.html.erb
new file mode 100644
index 000000000..27cfbc1a0
--- /dev/null
+++ b/app/views/admin/module_apps/show.html.erb
@@ -0,0 +1,37 @@
+
+<%=@module_app.key %>
+<%=@module_app.title %>
+<%=@module_app.version %>
+<%=@module_app.organization %>
+<%=@module_app.author %>
+<%=@module_app.intro %>
+<%=@module_app.update_info %>
+<%=@module_app.create_date %>
+<%=@module_app.enable_frontend%>
+<%=@module_app.app_pages%>
+<%=@module_app.widgets%>
+
+Mangers:
+
+ <% @module_app.sub_managers.each do |manager|%>
+ <%= manager.user.name %>
+ <%end%>
+
+
- |
+ <% if (fact_check_allow rescue false) %>
+ <%#= link_to("#{post?? 'Check': 'Checked'}",panel_announcement_back_end_bulletin_path ) %>
+ <% attribute_type = "post" %>
+ <% attribute = post %>
+ <%= link_to t(:ClickToCheck), panel_announcement_back_end_bulletin_path(attribute, :authenticity_token => form_authenticity_token, :bulletin => {:status => true}), :remote => true, :method => :put, :id => "disable_#{attribute.id}", :style => "display:#{attribute.status ? 'none' : ''}", :class => 'switch' %>
+ <%= link_to t(:ClickToUnCheck), panel_announcement_back_end_bulletin_path(attribute, :authenticity_token => form_authenticity_token, :bulletin => {:status => false}), :remote => true, :method => :put, :id => "enable_#{attribute.id}", :style => "display:#{attribute.status ? '' : 'none'}", :class => 'switch' %>
+
+ <% end %>
+
+ |
<%= post.bulletin_category.i18n_variable[I18n.locale] %> |
<%#= link_to post.title, panel_announcement_front_end_bulletin_path(post) %>
<%= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
|
<%= post.postdate %> |
- <%= (post.deadline) ? post.deadline : t('bulletin.no_deadline') %> |
+
+ <%= (post.deadline) ? post.deadline : t('bulletin.no_deadline') %>
+ |
<%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(post) %> |
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index 3de0b1c22..59f126a03 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -8,6 +8,8 @@
<%= link_to t('bulletin.new_announcement'), new_panel_announcement_back_end_bulletin_path %>
<%= link_to t('bulletin.announcement_list'), panel_announcement_back_end_bulletins_path %>
<%= link_to t('bulletin.new_announcement_class'), panel_announcement_back_end_bulletin_categorys_path %>
+ <%= link_to t('bulletin.my_announcement_fact_check'), panel_announcement_back_end_fact_checks_path %>
+
<% end -%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb
new file mode 100644
index 000000000..59bac03aa
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb
@@ -0,0 +1,15 @@
+<%= bulletin_category.key %>
+
+
+ <%= t('bulletin.status') %> |
+ <%= t('bulletin.category') %> |
+ <%= t('bulletin.title') %> |
+ <%= t('bulletin.postdate') %> |
+ <%= t('bulletin.deadline') %> |
+ <%= t('bulletin.action') %> |
+
+
+<% bulletin_category.bulletins.each do |post| %>
+ <%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %>
+<% end %>
+
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb
new file mode 100644
index 000000000..65ebeb286
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb
@@ -0,0 +1,51 @@
+<% content_for :secondary do %>
+
+
+
+
+
+
+ - <%= link_to t('bulletin.new_announcement'), new_panel_announcement_back_end_bulletin_path %>
+ - <%= link_to t('bulletin.announcement_list'), panel_announcement_back_end_bulletins_path %>
+ - <%= link_to t('bulletin.new_announcement_class'), panel_announcement_back_end_bulletin_categorys_path %>
+ - <%= link_to t('bulletin.my_announcement_fact_check'), panel_announcement_back_end_fact_checks_path %>
+
+
+<% end -%>
+
+<%= flash_messages %>
+
+
+
+
+
+
+
+
+
+
+
+
+<%= t('bulletin.list_announcement') %>
+
+ <%= render :partial => "list_table", :collection => @bulletin_categorys_preview,:as => :bulletin_category%>
+
+ <%= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%>
+
+
+
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 05554bab6..88bc3ae27 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -3,6 +3,7 @@ Rails.application.routes.draw do
namespace :panel do
namespace :announcement do
namespace :back_end do
+ resources :fact_checks
root :to => "bulletins#index"
resources :bulletins
resources :bulletin_categorys, :controller => 'bulletin_categorys' do
|