From 86a4a6cbe24f370c01746d715a771f2d46fc15aa Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 22 Jun 2012 14:32:28 +0800 Subject: [PATCH 01/32] put ldap setting into config file. should load be rails env. Also make god config more friendly. --- config/initializers/load_config.rb | 1 + config/initializers/nccu_ldap_connection.rb | 17 ++++------------- config/ldap.yml | 12 ++++++++++++ config/resque.god | 16 +++++++++++++--- 4 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 config/ldap.yml diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb index e6874293..0d22eac8 100644 --- a/config/initializers/load_config.rb +++ b/config/initializers/load_config.rb @@ -1 +1,2 @@ APP_CONFIG = YAML.load_file("#{Rails.root}/config/config.yml")[Rails.env] +LDAP_CONFIG = YAML.load_file("#{Rails.root}/config/ldap.yml")[Rails.env] \ No newline at end of file diff --git a/config/initializers/nccu_ldap_connection.rb b/config/initializers/nccu_ldap_connection.rb index 35e9ded8..00e03367 100644 --- a/config/initializers/nccu_ldap_connection.rb +++ b/config/initializers/nccu_ldap_connection.rb @@ -6,20 +6,11 @@ $nccu_ldap_connection module NccuLdapConnection BASE = 'ou=People,dc=nccu,dc=edu,dc=tw' - @ldap_host = { - :host => '127.0.0.1', #140.119.166.23 or 127.0.0.1 - :port => 8001, #389 or 8001 - # :filter => "(uid=#{login_uid})", - # :base => "ou=People,dc=nccu,dc=edu,dc=tw", - :authenticate_info => "cn=uccn,ou=profile,dc=nccu,dc=edu,dc=tw", - :authenticate_pwd => "nccu2ucc" - } - def self.establish - $nccu_ldap_connection = Net::LDAP.new - $nccu_ldap_connection.port = @ldap_host[:port] - $nccu_ldap_connection.host = @ldap_host[:host] - $nccu_ldap_connection.authenticate(@ldap_host[:authenticate_info],@ldap_host[:authenticate_pwd]) + $nccu_ldap_connection = Net::LDAP.new + $nccu_ldap_connection.port =LDAP_CONFIG["port"] + $nccu_ldap_connection.host = LDAP_CONFIG["host"] + $nccu_ldap_connection.authenticate(LDAP_CONFIG["authenticate_info"],LDAP_CONFIG["authenticate_pwd"]) end end \ No newline at end of file diff --git a/config/ldap.yml b/config/ldap.yml new file mode 100644 index 00000000..5c48fc1a --- /dev/null +++ b/config/ldap.yml @@ -0,0 +1,12 @@ +defaults: &defaults + authenticate_info: 'cn=uccn,ou=profile,dc=nccu,dc=edu,dc=tw' + authenticate_pwd: 'nccu2ucc' + +development: + <<: *defaults + host: '127.0.0.1' + port: 8001 +production: + <<: *defaults + host: '140.119.166.23' + port: 389 diff --git a/config/resque.god b/config/resque.god index 6f331dd8..80da5abe 100644 --- a/config/resque.god +++ b/config/resque.god @@ -1,7 +1,14 @@ +#developer pls change here +default_uid = 'kaito' +default_gid = 'staff' + rails_env = 'development' #ENV['RAILS_ENV'] || "production" -rails_root = ENV['RAILS_ROOT'] || "/Users/kaito/Documents/MyWorkspeace/NCCU" + + +rails_root = ENV['RAILS_ROOT'] || File.expand_path("..",File.dirname(__FILE__)) num_workers = rails_env == 'production' ? 5 : 2 + num_workers.times do |num| God.watch do |w| w.dir = "#{rails_root}" @@ -12,8 +19,11 @@ num_workers.times do |num| # w.env = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env} w.start = "rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env}" - w.uid = 'kaito' - w.gid = 'staff' + w.uid = rails_env == 'production' ? nccu : default_uid + w.gid = rails_env == 'production' ? nccu : default_gid + + + w.log = "#{rails_root}/log/god.log" # restart if memory gets too high w.transition(:up, :restart) do |on| From a36f73bafccf997d111596ddd84249ccf348d14e Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 22 Jun 2012 18:19:40 +0800 Subject: [PATCH 02/32] =?UTF-8?q?fix=200621=20Trello:"171=20=E9=A0=81?= =?UTF-8?q?=E9=9D=A2=E7=AE=A1=E7=90=86=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shared/_privilege_user.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/shared/_privilege_user.html.erb b/app/views/shared/_privilege_user.html.erb index 9d49be35..ba68996f 100644 --- a/app/views/shared/_privilege_user.html.erb +++ b/app/views/shared/_privilege_user.html.erb @@ -1,6 +1,6 @@
- - <%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => user.cache_dept[I18n.locale.to_s]},:class=>"checkbox clear" do %> + + <%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => (user.cache_dept[I18n.locale.to_s] rescue '')},:class=>"checkbox clear" do %>
From ffd95ee1fd4e997957722077b4909b9110941f24 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 25 Jun 2012 16:23:16 +0800 Subject: [PATCH 03/32] =?UTF-8?q?fix=20=E6=96=B0=E8=81=9E=E8=88=87?= =?UTF-8?q?=E5=85=AC=E5=91=8AQA-=E6=AC=8A=E9=99=90=E8=A8=AD=E5=AE=9A--?= =?UTF-8?q?=E5=84=AA=E5=85=88=E8=99=95=E7=90=863.=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E7=99=BC=E4=BD=88=E6=96=B0=E8=81=9E&=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E6=87=89=E8=A9=B2=E5=8F=AA=E8=83=BD=E7=9C=8B?= =?UTF-8?q?=E5=88=B0=E8=87=AA=E5=B7=B1=E7=99=BC=E4=BD=88=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E8=81=9E&=E5=85=AC=E5=91=8A=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E5=85=A8?= =?UTF-8?q?=E9=83=A8=EF=BC=8C=E8=80=8C=E4=B8=94=E5=8F=AF=E4=BB=A5=E5=88=AA?= =?UTF-8?q?=E9=99=A4=E5=85=B6=E4=BB=96=E4=BA=BA=E7=9A=84=E5=85=AC=E5=91=8A?= =?UTF-8?q?.=E8=87=B3=E5=B0=91=E8=A6=81=E4=B8=8D=E8=83=BD=E5=88=AA?= =?UTF-8?q?=E9=99=A4=E5=88=A5=E4=BA=BA=E7=9A=84=E5=85=AC=E5=91=8A=20?= =?UTF-8?q?=E6=96=B0=E8=81=9E=E8=88=87=E5=85=AC=E5=91=8AQA-=E7=B7=A8?= =?UTF-8?q?=E8=BC=AF=E5=95=8F=E9=A1=8C-=E7=99=BC=E4=BD=88=E6=96=B0?= =?UTF-8?q?=E8=81=9E=E6=99=82=EF=BC=8C=E7=99=BC=E4=BD=88=E5=96=AE=E4=BD=8D?= =?UTF-8?q?=E9=A0=90=E8=A8=AD=E7=82=BA=E8=AB=8B=E9=81=B8=E6=93=87=20?= =?UTF-8?q?=E6=96=B0=E8=81=9E=E8=88=87=E5=85=AC=E5=91=8AQA-=E7=B7=A8?= =?UTF-8?q?=E8=BC=AF=E5=95=8F=E9=A1=8C-=E5=85=AC=E5=91=8A=E6=A8=A1?= =?UTF-8?q?=E7=B5=84=E8=AB=8B=E7=A7=BB=E9=99=A4=20Subtitle=20=E6=AC=84?= =?UTF-8?q?=E4=BD=8D=20put=20rb-readline=20only=20in=20Linux=20make=20app?= =?UTF-8?q?=5Fmanager=20destroy=20after=20user=20deletion.=20=20=20may=20n?= =?UTF-8?q?eed=20to=20run:=20=20AppManager.all.collect{|am|=20=20am=20if?= =?UTF-8?q?=20am.user.nil=3F=20}.delete=5Fif=20{|x|=20x=20=3D=3D=20nil}.ea?= =?UTF-8?q?ch{|am|=20am.destroy}=20for=20clean=20up=20DB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 3 ++- Gemfile.lock | 2 -- app/models/app_manager.rb | 2 +- app/models/module_app.rb | 6 +++--- app/models/user/user.rb | 6 +++--- app/views/layouts/_side_bar.html.erb | 4 ++-- config/resque.god | 8 ++++---- .../announcement/back_end/bulletins_helper.rb | 6 ++++++ .../back_end/bulletins/_bulletin.html.erb | 8 ++++---- .../back_end/bulletins/_form.html.erb | 15 ++++----------- .../announcement/config/locales/zh_tw.yml | 1 + .../panel/news/back_end/news_bulletins_helper.rb | 6 ++++++ .../news/back_end/news_bulletins/_form.html.erb | 12 ++++++------ .../news_bulletins/_news_bulletin.html.erb | 2 ++ .../built_in_modules/news/config/locales/en.yml | 1 + .../news/config/locales/zh_tw.yml | 4 ++++ 16 files changed, 49 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 6eccd600..ca660050 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,6 @@ gem 'rake' gem 'resque' # background jobs gem 'resque-scheduler' # job scheduling gem 'resque-restriction' -gem 'rb-readline' gem 'ruby-debug19' gem 'rubyzip' gem 'therubyracer' @@ -34,6 +33,8 @@ gem 'sinatra' gem 'sprockets' gem 'tinymce-rails' gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") +gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux") + gem "impressionist", :require => "impressionist", :path => "vendor/impressionist" diff --git a/Gemfile.lock b/Gemfile.lock index e21da804..776d0b32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,6 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2.2) - rb-readline (0.4.2) rdoc (3.12) json (~> 1.4) redis (2.2.2) @@ -302,7 +301,6 @@ DEPENDENCIES radius rails (>= 3.1.0, < 3.2.0) rake - rb-readline resque resque-restriction resque-scheduler diff --git a/app/models/app_manager.rb b/app/models/app_manager.rb index 46cbbb91..0d81a0ec 100644 --- a/app/models/app_manager.rb +++ b/app/models/app_manager.rb @@ -1,7 +1,7 @@ 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" diff --git a/app/models/module_app.rb b/app/models/module_app.rb index 7ad4ac1d..9708316f 100644 --- a/app/models/module_app.rb +++ b/app/models/module_app.rb @@ -4,7 +4,7 @@ class ModuleApp include OrbitCoreLib::ObjectTokenUnility field :key - field :title + field :title field :version field :organization field :author @@ -16,8 +16,8 @@ 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_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_many :tags has_many :page_parts diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 7c1e4c63..4f820c16 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -17,10 +17,10 @@ class User has_many :attribute_values, :autosave => true, :dependent => :destroy 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 :blocked_apps, :inverse_of => :blocked_users, :class_name => "AppAuth", :dependent => :destroy + has_many :privilege_apps, :inverse_of => :privilege_users, :class_name => "AppAuth", :dependent => :destroy - has_many :managing_apps,:class_name => "AppManager" + has_many :managing_apps,:class_name => "AppManager", :dependent => :destroy belongs_to :role has_and_belongs_to_many :sub_roles diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 73b5191a..26925aee 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -12,7 +12,7 @@ <%= content_tag :li, link_to(t('announcement.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") ) %> <%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting') if (is_manager? rescue nil) %> + <%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting') if (is_manager? rescue true) %> <%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %> <% end -%> @@ -26,7 +26,7 @@ <%= content_tag :li, link_to(t('announcement.add_new'), new_panel_news_back_end_news_bulletin_path), :class => active_for_action('news_bulletins', 'new') %> <%= content_tag :li, link_to(t('announcement.categories'), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') || active_for_ob_auths_object("NewsBulletinCategory") %> <%= content_tag :li, link_to(t('announcement.tags'), panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting') if (is_manager? rescue nil) %> + <%= content_tag :li, link_to(t('announcement.bulletin.approval_setting'), panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting') if (is_manager? rescue true) %> <%= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %> <% end -%> diff --git a/config/resque.god b/config/resque.god index 80da5abe..aa9cb0b4 100644 --- a/config/resque.god +++ b/config/resque.god @@ -2,7 +2,7 @@ default_uid = 'kaito' default_gid = 'staff' -rails_env = 'development' #ENV['RAILS_ENV'] || "production" +rails_env = ENV['RAILS_ENV'] || "production" rails_root = ENV['RAILS_ROOT'] || File.expand_path("..",File.dirname(__FILE__)) @@ -17,10 +17,10 @@ num_workers.times do |num| w.interval = 30.seconds p "/usr/bin/rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env}" # w.env = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env} - w.start = "rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env}" + w.start = "rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env} -P /var/godgod.#{port}.pid" - w.uid = rails_env == 'production' ? nccu : default_uid - w.gid = rails_env == 'production' ? nccu : default_gid + w.uid = rails_env == 'production' ? "nccu" : default_uid + w.gid = rails_env == 'production' ? "nccu" : default_gid w.log = "#{rails_root}/log/god.log" diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb index c384bc8f..49f24079 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb @@ -6,4 +6,10 @@ module Panel::Announcement::BackEnd::BulletinsHelper by_bulletin and by_user end + def show_delete_link(bulletin) + by_bulletin = (bulletin.create_user_id == current_user.id) + by_user = (is_manager? or is_admin?) + by_bulletin or by_user + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 8f879e79..afb57306 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -48,12 +48,12 @@
  • <%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %>
    • - <%#= debugger %> - <%#= a=1 %> - <% end %> -
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <% end -%> + <% if show_delete_link(bulletin) %> +
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <% end %> <% if show_approval_link(bulletin) %>
  • <%= link_to t('announcement.bulletin.approval'), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %>
    • <%#= #TODO add ancher so user can quick access into that part %> <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index c515dc65..c7f544e6 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -123,7 +123,7 @@ <%#= f.label :unit_list_for_anc%> <%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %> - <%= f.label :category %> + <%= f.label :category,t('announcement.bulletin.category')%> <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
      @@ -141,23 +141,16 @@
      ">
      - <%= f.label :title %> + <%= f.label :title ,t('announcement.bulletin.title')%> <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_field locale, :class=>'post-title' %> <% end %>
      +
      - <%= f.label :subtitle %> - <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> - <% end %> -
      - -
      - <%= f.label :text %> + <%= f.label :text ,t('announcement.bulletin.text')%> <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index 4fb22bb9..af1364a9 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -49,6 +49,7 @@ zh_tw: bulletins: 公告訊息 related_links: 相關連結 bulletin: + text: 內文 category: 分類 submit_user_list: 張貼人 list_lower: 列表 diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb index 8bf47a3d..b77e70a9 100644 --- a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb +++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb @@ -6,4 +6,10 @@ module Panel::News::BackEnd::NewsBulletinsHelper by_news_bulletin and by_user end + def news_show_delete_link(news_bulletin) + by_news_bulletin = (news_bulletin.create_user_id == current_user.id) + by_user = (is_manager? or is_admin?) + by_news_bulletin or by_user + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb index eb2a2d95..837ebffe 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb @@ -118,10 +118,10 @@
      - <%= f.label :unit_list_for_anc%> - <%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %> + <%= f.label :unit_list_for_anc,t('news.news_bulletin.unit_name')%> + <%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {:prompt => t("news.news_bulletin.ut_prompt")}, :class => "input-medium" %> - <%= f.label :category %> + <%= f.label :category,t('news.news_bulletin.category') %> <%= f.select :news_bulletin_category_id, @news_bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
        @@ -139,7 +139,7 @@
        ">
        - <%= f.label :title %> + <%= f.label :title, t('news.news_bulletin.title')%> <%= f.fields_for :title, (@news_bulletin.new_record? ? @news_bulletin.build_title : @news_bulletin.title ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_field locale, :class=>'post-title' %> @@ -147,7 +147,7 @@
        - <%= f.label :subtitle %> + <%= f.label :subtitle, t('news.news_bulletin.subtitle') %> <%= f.fields_for :subtitle, (@news_bulletin.new_record? ? @news_bulletin.build_subtitle : @news_bulletin.subtitle ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> @@ -155,7 +155,7 @@
        - <%= f.label :text %> + <%= f.label :text, t('news.news_bulletin.text') %> <%= f.fields_for :text, (@news_bulletin.new_record? ? @news_bulletin.build_text : @news_bulletin.text ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb index 95a3d4fe..7181a1cd 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb @@ -52,6 +52,8 @@ <%#= a=1 %> <% end %> + <% end %> + <% if news_show_delete_link(news_bulletin) %>
      • <%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %>
        • <% end %> <% if news_show_approval_link(news_bulletin) %> diff --git a/vendor/built_in_modules/news/config/locales/en.yml b/vendor/built_in_modules/news/config/locales/en.yml index 37f06ea4..94f3f556 100644 --- a/vendor/built_in_modules/news/config/locales/en.yml +++ b/vendor/built_in_modules/news/config/locales/en.yml @@ -65,6 +65,7 @@ en: related_links: Related Links news: News news_bulletin: + ut_prompt: Please select UT category: Category list_lower: " list" title: Title diff --git a/vendor/built_in_modules/news/config/locales/zh_tw.yml b/vendor/built_in_modules/news/config/locales/zh_tw.yml index d52554c2..7dc117cd 100644 --- a/vendor/built_in_modules/news/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/news/config/locales/zh_tw.yml @@ -47,9 +47,13 @@ zh_tw: related_links: 相關連結 news: 新聞 news_bulletin: + ut_prompt: 請選擇單位 category: 分類 list_lower: 列表 title: 標題 + subtitle: 副標題 + text: 內文 + unit_name: 發佈單位 postdate: 張貼日期 approval: 新聞審核 approval_setting: 審核設定 From 73fbed8837ad385caac1cf55cf2736d91678d0d1 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 26 Jun 2012 10:04:40 +0800 Subject: [PATCH 04/32] fix 1.page_content user empty problem 2.add i18n variable for news and announcement --- .../back_end/page_contexts/_page_context.html.erb | 2 +- .../panel/web_resource/back_end/web_links/_form.html.erb | 8 ++++---- .../web_resource/back_end/web_links/_web_link.html.erb | 4 ++-- .../web_resource/config/locales/zh_tw.yml | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb index 7e056432..80862d04 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb @@ -19,5 +19,5 @@ <%end -%> <%= display_date_time(page_context.updated_at) %> - <%= User.find(page_context.create_user_id).name %> + <%= User.find(page_context.create_user_id).name rescue '' %> \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index 03d11db1..60574b94 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -53,7 +53,7 @@
        - <%= f.label :category %> + <%= f.label :category ,t("web_resource.category")%> <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
          @@ -68,7 +68,7 @@
          ">
          - <%= f.label :name %> + <%= f.label :name ,t("web_resource.name")%> <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_field locale, :class=>'post-title' %> @@ -76,7 +76,7 @@
          - <%= f.label :describe %> + <%= f.label :describe,t("web_resource.describe") %> <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%" %> @@ -90,7 +90,7 @@
          - <%= f.label :url %> + <%= f.label :url,t("web_resource.url") %> <%= f.text_field :url %>
          diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb index 7efa3b72..85a6ad93 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb @@ -25,8 +25,8 @@
            <%if at_least_module_manager || web_link.web_link_category.cur_user_is_sub_manager_of(:edit)%> -
          • <%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(web_link) %>
            • -
          • <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(web_link), :confirm => t('sure?'), :method => :delete, :remote => true %>
            • +
          • <%= link_to t('edit'), edit_panel_web_resource_back_end_web_link_path(web_link) %>
            • +
          • <%= link_to t('delete'), panel_web_resource_back_end_web_link_path(web_link), :confirm => t('sure?'), :method => :delete, :remote => true %>
            • <% end -%>
          diff --git a/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml b/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml index ace65d53..607900d9 100644 --- a/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml @@ -21,6 +21,10 @@ zh_tw: web_resource: list_lower: 列表 list_link: 鏈接列表 + category: 分類 + name: 名稱 + describe: 描述 + url: 路徑 From 56b1bd9eaa07a80b1c8a503f3e883a3d17fdb50d Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 26 Jun 2012 10:57:51 +0800 Subject: [PATCH 05/32] add translation --- app/helpers/admin/web_link_helper.rb | 2 +- .../back_end/web_link_categorys/_web_link_category.html.erb | 4 ++-- vendor/built_in_modules/web_resource/config/locales/zh_tw.yml | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/helpers/admin/web_link_helper.rb b/app/helpers/admin/web_link_helper.rb index 813bc48c..0498f31b 100644 --- a/app/helpers/admin/web_link_helper.rb +++ b/app/helpers/admin/web_link_helper.rb @@ -6,6 +6,6 @@ module Admin::WebLinkHelper web_link.object_auths.new(title: type ).save oa = web_link.get_object_auth_by_title(type) end - link_to t('admin.web_link.cate_auth'),admin_object_auth_ob_auth_path(oa) + link_to t('web_resource.cate_auth'),admin_object_auth_ob_auth_path(oa) end end \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb index b17e634b..66a772cf 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb @@ -6,8 +6,8 @@ <%if at_least_module_manager %>
            -
          • <%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %>
            • -
          • <%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
            • +
          • <%= link_to t('web_resource.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %>
            • +
          • <%= link_to t('web_resource.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
          • <%= show_web_link_permission_link web_link_category %>
          diff --git a/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml b/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml index 607900d9..a0104cbd 100644 --- a/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/web_resource/config/locales/zh_tw.yml @@ -25,7 +25,9 @@ zh_tw: name: 名稱 describe: 描述 url: 路徑 - + edit: 編輯 + delete: 刪除 + cate_auth: 分類授權 # Chinese (Taiwan) translations for Ruby on Rails From 2b54067ecbc5defea4cdb2b0b9f7ae35dbbd04a7 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 26 Jun 2012 14:28:21 +0800 Subject: [PATCH 06/32] change order of display menu of categories of news_bulletin and bulletin. --- .../panel/announcement/back_end/bulletins_helper.rb | 8 ++++++++ .../bulletin_categorys/_bulletin_category.html.erb | 7 +++---- .../announcement/back_end/bulletins/_bulletin.html.erb | 3 +-- .../helpers/panel/news/back_end/news_bulletins_helper.rb | 9 +++++++++ .../_news_bulletin_category.html.erb | 7 +++---- .../news/back_end/news_bulletins/_news_bulletin.html.erb | 4 +--- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb index 49f24079..88920b9e 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb @@ -12,4 +12,12 @@ module Panel::Announcement::BackEnd::BulletinsHelper by_bulletin or by_user end + def show_bulletin_title_at_index (bulletin) + if bulletin.is_checked? + link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue '' + else + bulletin.title[I18n.locale] + end + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb index b5013698..6b98e466 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb @@ -4,14 +4,13 @@ <%= bulletin_category.key %>
            - <%if is_manager? || is_admin? %> -
          • <%= show_anc_cate_permission_link(bulletin_category) %>
            • - <% end %> <% if is_admin?%>
          • <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
          • <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
            • <% end %> - + <%if is_manager? || is_admin? %> +
          • <%= show_anc_cate_permission_link(bulletin_category) %>
            • + <% end %>
          diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index afb57306..edff4d2d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -30,8 +30,7 @@ <%= bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %> - <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%> - + <%= show_bulletin_title_at_index bulletin%>
            <% if (bulletin.create_user_id == current_user.id) || is_manager? %> diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb index b77e70a9..e2765c33 100644 --- a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb +++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb @@ -12,4 +12,13 @@ module Panel::News::BackEnd::NewsBulletinsHelper by_news_bulletin or by_user end + def show_news_bulletin_title_at_index (news_bulletin) + if news_bulletin.is_checked? + + link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue '' + else + news_bulletin.title[I18n.locale] + end + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb index 94a4e851..f96f8fb4 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb @@ -4,14 +4,13 @@ <%= news_bulletin_category.key %>
              - <%if is_manager? || is_admin? %> -
            • <%= show_news_cate_permission_link(news_bulletin_category) %>
              • - <% end %> <% if is_admin?%>
            • <%= link_to t('bulletin_category.edit'), edit_panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :remote => true %>
            • <%= link_to t('bulletin_category.delete'), panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
              • <% end %> - + <%if is_manager? || is_admin? %> +
            • <%= show_news_cate_permission_link(news_bulletin_category) %>
              • + <% end %>
            diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb index 7181a1cd..02efd630 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb @@ -29,9 +29,7 @@
          <%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] rescue nil %> - - <%= link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue ''%> - + <%= show_news_bulletin_title_at_index news_bulletin%>
            <% if (news_bulletin.create_user_id == current_user.id) || is_manager? %> From df722ba90f26ed2295571d8e0dd36fd2d862b4c5 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 26 Jun 2012 16:21:18 +0800 Subject: [PATCH 07/32] change display of user dept for showing announcement --- .../panel/announcement/front_end/bulletins/show.html.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb index 24c61043..e14589b2 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb @@ -3,10 +3,8 @@
            <%= dislpay_view_count(@bulletin) %> - <%= display_date_time(@bulletin.postdate) %> - <% unit = User.find(@bulletin.create_user_id).sub_roles.collect{|t| t.key}.join(" ") rescue nil %> - <%= " | " if unit %> - <%= unit %> + <%= display_date_time(@bulletin.postdate) %> + <%= User.find(@bulletin.create_user_id).cache_dept[I18n.locale.to_s] rescue nil %>
            From 818c58c1eed986faa2e41d4ed203ad04dbcfc539 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 26 Jun 2012 17:46:02 +0800 Subject: [PATCH 08/32] =?UTF-8?q?fix=20for=20=E6=96=B0=E8=81=9E=E8=88=87?= =?UTF-8?q?=E5=85=AC=E5=91=8AQA=20=091.8.=E6=96=B0=E8=81=9E=E6=88=96?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=9A=84=E3=80=8C=E6=AA=94=E6=A1=88=E5=AE=A4?= =?UTF-8?q?=E3=80=8D=E4=B8=8A=E5=82=B3=E5=9C=96=E7=89=87=E5=BE=8C=E5=86=8D?= =?UTF-8?q?=E8=A1=8C=E7=B7=A8=E8=BC=AF=E6=99=82=EF=BC=8C=E5=9C=96=E7=89=87?= =?UTF-8?q?=E7=84=A1=E6=B3=95=E6=AD=A3=E5=B8=B8=E9=A1=AF=E7=A4=BA=EF=BC=88?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E8=A2=AB?= =?UTF-8?q?=E7=B7=A8=E8=BC=AF=E8=AA=BF=E6=95=B4=E4=B8=A6=E6=96=BC=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E9=A1=AF=E7=A4=BA=EF=BC=89=20=092.add=20=20=E4=B8=8A?= =?UTF-8?q?=E5=82=B3=E6=AA=94=E6=A1=88=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= =?UTF-8?q?:=203MB=20=093.=E5=85=AC=E5=91=8A=E7=9A=84=E7=99=BC=E4=BD=88?= =?UTF-8?q?=E5=96=AE=E4=BD=8D=E7=82=BA=E4=BD=95=E6=98=AF=E9=A1=AF=E7=A4=BA?= =?UTF-8?q?=E5=96=AE=E4=BD=8D=E4=BB=A3=E7=A2=BC=EF=BC=9AM00=EF=BC=9F?= =?UTF-8?q?=E6=87=89=E9=A1=AF=E7=A4=BA=E7=99=BC=E5=B8=83=E5=96=AE=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/gridfs_controller.rb | 2 +- app/controllers/sessions_controller.rb | 2 +- config/locales/en.yml | 5 +++- config/locales/zh_tw.yml | 3 ++ config/routes.rb | 3 +- .../announcement/back_end/bulletins_helper.rb | 17 +++++++++++ .../news/back_end/news_bulletins_helper.rb | 3 +- .../back_end/news_bulletins/_form.html.erb | 30 +++++++++++-------- .../_form_news_bulletin_file.html.erb | 3 +- 9 files changed, 48 insertions(+), 20 deletions(-) diff --git a/app/controllers/gridfs_controller.rb b/app/controllers/gridfs_controller.rb index 4be7ec17..b7f926b1 100644 --- a/app/controllers/gridfs_controller.rb +++ b/app/controllers/gridfs_controller.rb @@ -3,7 +3,7 @@ require 'mongo' class GridfsController < ActionController::Metal def serve - gridfs_path = env["PATH_INFO"].gsub("/gridfs/", "").force_encoding("UTF-8") + gridfs_path = (params[:path]+'.'+params[:format]).gsub("/gridfs/", "").force_encoding("UTF-8") begin gridfs_file = Mongo::GridFileSystem.new(Mongoid.database).open(gridfs_path, 'r') self.response_body = gridfs_file.read diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index a6925aa4..77680e5b 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -15,7 +15,7 @@ class SessionsController < Devise::SessionsController if $nccu_ldap_connection.bind logger.info "=LDAP Binded password ok..." result =check_auth_with_ldap(login_uid,login_password) - if result #&& login_password!='' + if result && login_password!='' logger.info "==LDAP password passed..." nccu_id = get_nccu_id_from_mid_site(login_uid) resource = nccu_id.nil? ? nil : (User.first(conditions:{ nccu_ldap_uid: nccu_id })) diff --git a/config/locales/en.yml b/config/locales/en.yml index fd08be49..054d1c23 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -289,4 +289,7 @@ en: modal: close: Close preview: Preview - + sys: + not_previewable: "Preview not support" + limit_of_upload_file_size: "Upload file must be less than: %{best_size}" + diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 0eb12ba1..930f5902 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -508,3 +508,6 @@ zh_tw: modal: close: "關閉" preview: "預覽" + sys: + not_previewable: "不支援預覽" + limit_of_upload_file_size: "上傳檔案大小限制: %{best_size}" diff --git a/config/routes.rb b/config/routes.rb index 75fa6142..40e82749 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -140,7 +140,8 @@ Orbit::Application.routes.draw do } # routes for gridfs files - match "/gridfs/*path" => "gridfs#serve" + match "/gridfs/*path" => "gridfs#serve" + # match "/images/*path" => "gridfs#serve_images" # match "/admin/pages/images/*path" => "gridfs#serve_images" diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb index 88920b9e..8a67bfe7 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb @@ -20,4 +20,21 @@ module Panel::Announcement::BackEnd::BulletinsHelper end end + def file_picture_preview_setting(file_path) + res= "" + ext = File.extname(file_path) + unless file_path.nil? + case ext + when ".jpg",".png",".gif" + #res = '' + #res.html_safe + {"data-content" => "#{image_tag file_path}" } + else + {"data-content" => t("sys.not_previewable") } + end + end + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb index e2765c33..d448b5ff 100644 --- a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb +++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb @@ -14,9 +14,8 @@ module Panel::News::BackEnd::NewsBulletinsHelper def show_news_bulletin_title_at_index (news_bulletin) if news_bulletin.is_checked? - link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue '' - else + else news_bulletin.title[I18n.locale] end end diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb index 837ebffe..f3d1753b 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb @@ -237,6 +237,8 @@
            <%= hidden_field_tag 'news_bulletin_file_field_count', @news_bulletin.news_bulletin_files.count %> <%= t(:add) %> +

            <%= t("sys.limit_of_upload_file_size",:best_size => '3MB') %>

            +
            @@ -249,10 +251,9 @@ <%= render :partial => 'form_news_bulletin_file', :object => news_bulletin_file, :locals => {:f => f, :i => i} %> <% end %> <% end %> - + -
          @@ -275,17 +276,20 @@ <% content_for :page_specific_javascript do %> <%= javascript_include_tag "inc/jquery.imagesloaded.js" %> <% end %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb index 27867f49..da05812a 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb @@ -4,7 +4,8 @@
          <%= f.file_field :file %> - <%= form_news_bulletin_file.file.file ? ( link_to t(:view), form_news_bulletin_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> + <%#= file_picture_preview_setting(form_news_bulletin_file.file.url) %> + <%= form_news_bulletin_file.file.file ? ( link_to t(:view), form_news_bulletin_file.file.url, {:class => 'for_preview btn', :target => '_blank', :title => t(:view)}.merge(file_picture_preview_setting(form_news_bulletin_file.file.url)) ) : '' %>
          From 83a72bdf6e01c4263fe0d171eaf3b32e6b210d39 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 26 Jun 2012 18:23:44 +0800 Subject: [PATCH 09/32] fix for announcement --- .../helpers/panel/announcement/back_end/bulletins_helper.rb | 2 +- .../panel/announcement/back_end/bulletins/_form.html.erb | 5 +++++ .../back_end/bulletins/_form_bulletin_file.html.erb | 3 ++- .../news_bulletins/_form_news_bulletin_file.html.erb | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb index 8a67bfe7..91147c62 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb @@ -25,7 +25,7 @@ module Panel::Announcement::BackEnd::BulletinsHelper ext = File.extname(file_path) unless file_path.nil? case ext - when ".jpg",".png",".gif" + when ".jpg",".jpeg",".png",".gif" #res = '' diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index c7f544e6..73d088b7 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -232,6 +232,7 @@
          <%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %> <%= t(:add) %> +

          <%= t("sys.limit_of_upload_file_size",:best_size => '3MB') %>

          @@ -270,6 +271,8 @@ <% content_for :page_specific_javascript do %> <%= javascript_include_tag "inc/jquery.imagesloaded.js" %> <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb index 38ab1edb..143525f0 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb @@ -4,7 +4,8 @@
          <%= f.file_field :file %> - <%= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> + <%#= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> + <%= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:class => 'for_preview btn', :target => '_blank', :title => t(:view)}.merge(file_picture_preview_setting(form_bulletin_file.file.url)) ) : '' %>
          diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb index da05812a..d2c27125 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb @@ -4,7 +4,6 @@
          <%= f.file_field :file %> - <%#= file_picture_preview_setting(form_news_bulletin_file.file.url) %> <%= form_news_bulletin_file.file.file ? ( link_to t(:view), form_news_bulletin_file.file.url, {:class => 'for_preview btn', :target => '_blank', :title => t(:view)}.merge(file_picture_preview_setting(form_news_bulletin_file.file.url)) ) : '' %>
          From 6a4abc6c43ac8d74ce58e96fb0682a4db5ff8cc2 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 27 Jun 2012 09:59:32 +0800 Subject: [PATCH 10/32] fix news error --- app/assets/javascripts/bulletin_form.js.erb | 4 ++++ app/assets/javascripts/news_bulletin_form.js | 4 ++++ .../views/panel/announcement/back_end/bulletins/edit.html.erb | 4 ++++ .../panel/news/back_end/news_approvals_controller.rb | 4 ++-- .../views/panel/news/back_end/news_bulletins/edit.html.erb | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index cf2dfd69..c51587f4 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -1,3 +1,5 @@ +$(document).ready(function(){ +//alert("Anc Loaded"); $('.bulletin_links_block a.delete').live('click', function(){ $(this).parents('.list_item').remove(); }); @@ -16,4 +18,6 @@ $(document).on('click', '.quick_edit_cancel', function(){ $('#' + tr).hide(); $("tr#bulletin_file_" + $(this).prev().attr('value')).hide(); $("tr#bulletin_link_" + $(this).prev().attr('value')).hide(); +}); + }); \ No newline at end of file diff --git a/app/assets/javascripts/news_bulletin_form.js b/app/assets/javascripts/news_bulletin_form.js index 6f0f9ac5..c6c98b68 100644 --- a/app/assets/javascripts/news_bulletin_form.js +++ b/app/assets/javascripts/news_bulletin_form.js @@ -1,3 +1,6 @@ +$(document).ready(function(){ +//alert("News Loaded"); + $('.news_bulletin_links_block a.delete').live('click', function(){ $(this).parents('.list_item').remove(); }); @@ -16,4 +19,5 @@ $(document).on('click', '.quick_edit_cancel', function(){ $('#' + tr).hide(); $("tr#news_bulletin_file_" + $(this).prev().attr('value')).hide(); $("tr#news_bulletin_link_" + $(this).prev().attr('value')).hide(); +}); }); \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb index 27211047..c15e45b1 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb @@ -8,3 +8,7 @@ <%= render :partial => 'form', :locals => {:f => f} %> <% end %>
          +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "bulletin_form" %> +<% end %> + diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb index 0f10fe91..7354d360 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb @@ -4,11 +4,11 @@ class Panel::News::BackEnd::NewsApprovalsController < OrbitBackendController include AdminHelper def preview_and_approve - @news_bulletin = NewsBulletin.find params[:news_category][:id] + @news_bulletin = NewsBulletin.find params[:news_bulletin_id] end def approve - + end def setting diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb index 8149a86e..6603d41d 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb @@ -8,3 +8,6 @@ <%= render :partial => 'form', :locals => {:f => f} %> <% end %>
        +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "news_bulletin_form" %> +<% end %> From 4c4929c20aa4ef1e3a9a69789140d19077a2b8dc Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 27 Jun 2012 11:36:18 +0800 Subject: [PATCH 11/32] Fix js for news quick_edit and edit for files --- app/assets/javascripts/news_bulletin_form.js | 2 +- .../back_end/news_bulletins/_form_news_bulletin_file.html.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/news_bulletin_form.js b/app/assets/javascripts/news_bulletin_form.js index c6c98b68..9038cbb8 100644 --- a/app/assets/javascripts/news_bulletin_form.js +++ b/app/assets/javascripts/news_bulletin_form.js @@ -11,7 +11,7 @@ $('.news_bulletin_files_block a.delete').live('click', function(){ $(document).on('click', '.action a.remove_existing_record', function(){ $(this).next('.should_destroy').attr('value', 1); - $("tr #" + $(this).prev().attr('value')).hide(); + $("tr#" + $(this).prev().attr('value')).hide(); }); $(document).on('click', '.quick_edit_cancel', function(){ diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb index d2c27125..61a96f42 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_file.html.erb @@ -62,6 +62,7 @@ <% else %> <%= f.hidden_field :id %> + <%= hidden_field_tag :tr, (dom_id form_news_bulletin_file) %> <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <% end %> From 55449efb352cc9f32de86b9c58742ba70c2ca303 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 27 Jun 2012 14:21:06 +0800 Subject: [PATCH 12/32] =?UTF-8?q?fix=20=E6=96=B0=E8=81=9E=E8=88=87?= =?UTF-8?q?=E5=85=AC=E5=91=8AQA=20=091.=E5=84=AA=E5=85=88=E8=99=95?= =?UTF-8?q?=E7=90=86-=E5=BF=AB=E9=80=9F=E7=B7=A8=E8=BC=AF=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=AA=94=E6=A1=88=E4=B8=8A=E5=82=B3=E7=84=A1=E6=B3=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E4=BD=86=E5=8F=AF=E5=88=AA=E9=99=A4?= =?UTF-8?q?=20=092.=E5=84=AA=E5=85=88=E8=99=95=E7=90=86-=E7=B7=A8=E8=BC=AF?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=AA=94=E6=A1=88=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=84=A1=E6=B3=95=E5=88=AA=E9=99=A4=20=093.=E5=84=AA=E5=85=88?= =?UTF-8?q?=E8=99=95=E7=90=86-=E5=88=AA=E9=99=A4=E6=99=82=E6=87=89?= =?UTF-8?q?=E5=BD=88=E5=87=BA=E8=AD=A6=E5=91=8A=E8=A6=96=E7=AA=97=EF=BC=8C?= =?UTF-8?q?=E8=AB=8Buser=E7=A2=BA=E8=AA=8D=E4=B8=80=E6=AC=A1=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=B0=87=E6=AA=94=E6=A1=88=E5=88=AA=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/bulletin_form.js.erb | 6 ++++-- .../{news_bulletin_form.js => news_bulletin_form.js.erb} | 6 ++++-- .../back_end/bulletins/_form_bulletin_file.html.erb | 1 + .../panel/announcement/back_end/bulletins/index.html.erb | 6 ++++++ 4 files changed, 15 insertions(+), 4 deletions(-) rename app/assets/javascripts/{news_bulletin_form.js => news_bulletin_form.js.erb} (78%) diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index c51587f4..606ada3e 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -9,8 +9,10 @@ $('.bulletin_files_block a.delete').live('click', function(){ }); $(document).on('click', '.action a.remove_existing_record', function(){ - $(this).next('.should_destroy').attr('value', 1); - $("tr #" + $(this).prev().attr('value')).hide(); + if(confirm("<%= I18n.t('announcement.sure?')%>")){ + $(this).next('.should_destroy').attr('value', 1); + $("tr#" + $(this).prev().attr('value')).hide(); + } }); $(document).on('click', '.quick_edit_cancel', function(){ diff --git a/app/assets/javascripts/news_bulletin_form.js b/app/assets/javascripts/news_bulletin_form.js.erb similarity index 78% rename from app/assets/javascripts/news_bulletin_form.js rename to app/assets/javascripts/news_bulletin_form.js.erb index 9038cbb8..d3a3c2c7 100644 --- a/app/assets/javascripts/news_bulletin_form.js +++ b/app/assets/javascripts/news_bulletin_form.js.erb @@ -10,8 +10,10 @@ $('.news_bulletin_files_block a.delete').live('click', function(){ }); $(document).on('click', '.action a.remove_existing_record', function(){ - $(this).next('.should_destroy').attr('value', 1); - $("tr#" + $(this).prev().attr('value')).hide(); + if(confirm("<%= I18n.t('news.sure?')%>")){ + $(this).next('.should_destroy').attr('value', 1); + $("tr#" + $(this).prev().attr('value')).hide(); + } }); $(document).on('click', '.quick_edit_cancel', function(){ diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb index 143525f0..8aeab6c6 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb @@ -63,6 +63,7 @@ <% else %> <%= f.hidden_field :id %> + <%= hidden_field_tag :tr, (dom_id form_bulletin_file) %> <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <% end %> 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 c64035a5..526dbead 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 @@ -18,6 +18,12 @@
        +
        + +
        + <% content_for :page_specific_javascript do %> <%= javascript_include_tag "bulletin_form" %> <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %> From 04a23db745beb40c6008e90dc80a5207e408b964 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 27 Jun 2012 14:27:27 +0800 Subject: [PATCH 13/32] fix invalid invalid byte sequence in US-ASCII for js files --- app/assets/javascripts/bulletin_form.js.erb | 1 + app/assets/javascripts/news_bulletin_form.js.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index 606ada3e..0240c613 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -1,3 +1,4 @@ +<%#= encoding: utf-8 %> $(document).ready(function(){ //alert("Anc Loaded"); $('.bulletin_links_block a.delete').live('click', function(){ diff --git a/app/assets/javascripts/news_bulletin_form.js.erb b/app/assets/javascripts/news_bulletin_form.js.erb index d3a3c2c7..e75e8d4f 100644 --- a/app/assets/javascripts/news_bulletin_form.js.erb +++ b/app/assets/javascripts/news_bulletin_form.js.erb @@ -1,3 +1,4 @@ +<%#= encoding: utf-8 %> $(document).ready(function(){ //alert("News Loaded"); From 243c9e294607f72dc495a37f9d343d3b8b4e7b2f Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 27 Jun 2012 15:16:16 +0800 Subject: [PATCH 14/32] fix relation between bulletin and category (news also) --- .../announcement/app/models/bulletin_category.rb | 2 +- .../built_in_modules/news/app/models/news_bulletin_category.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb index 74e5b648..feb39edb 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb @@ -17,7 +17,7 @@ class BulletinCategory has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy - has_many :bulletins + has_many :bulletins,:dependent => :destroy def pp_object i18n_variable[I18n.locale] diff --git a/vendor/built_in_modules/news/app/models/news_bulletin_category.rb b/vendor/built_in_modules/news/app/models/news_bulletin_category.rb index a9997b99..c1f60e91 100644 --- a/vendor/built_in_modules/news/app/models/news_bulletin_category.rb +++ b/vendor/built_in_modules/news/app/models/news_bulletin_category.rb @@ -17,7 +17,7 @@ class NewsBulletinCategory has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy - has_many :news_bulletins + has_many :news_bulletins,:dependent => :destroy def pp_object i18n_variable[I18n.locale] From 58a11ff569577f437abf3fe475d5b10efe8793fa Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 28 Jun 2012 13:50:11 +0800 Subject: [PATCH 15/32] fix javascript for new and anc link removing --- .../announcement/back_end/bulletins/_form_bulletin_link.html.erb | 1 + .../back_end/news_bulletins/_form_news_bulletin_link.html.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb index cfd91358..af29e28c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb @@ -39,6 +39,7 @@ <% else %> <%= f.hidden_field :id %> + <%= hidden_field_tag :tr, (dom_id form_bulletin_link) %> <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <% end %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_link.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_link.html.erb index f7d58919..4a07005b 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_link.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form_news_bulletin_link.html.erb @@ -39,6 +39,7 @@ <% else %> <%= f.hidden_field :id %> + <%= hidden_field_tag :tr, (dom_id form_news_bulletin_link) %> <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <% end %> From 6c4c1046bc8421294850f1fb4f78cc2c5b1ef9c3 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 28 Jun 2012 15:19:51 +0800 Subject: [PATCH 16/32] fix date select cause error back to the time of Jesus --- .../back_end/bulletins_controller.rb | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 1dceb90e..e2b8b7cf 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -76,7 +76,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/new # GET /bulletins/new.xml def new - @bulletin = Bulletin.new + @bulletin = Bulletin.new(:postdate => DateTime.now) @link_url = panel_announcement_back_end_bulletins_path @@ -137,7 +137,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController else @bulletin = Bulletin.new(params[:bulletin]) - @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil) + @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil) @bulletin.create_user_id = current_user.id @bulletin.update_user_id = current_user.id @@ -216,7 +216,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # PUT /bulletins/1 # PUT /bulletins/1.xml def update - if params[:bulletin_link] @bulletin_link = BulletinLink.find(params[:id]) @@ -246,9 +245,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController else @bulletin = Bulletin.find(params[:id]) - @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil) - - @bulletin.update_user_id = current_user.id + # @bulletin.image.clear if params[:bulletin][:image_del] == '1' # if params[:bulletin][:image_del] == '1' @@ -256,9 +253,15 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletin.image_del = nil # params[:bulletin][:image_del] = nil # end - + + delete_out_invalid_date_from_params respond_to do |format| if @bulletin.update_attributes(params[:bulletin]) + # if (@bulletin.deadline < @bulletin.postdate rescue nil) + # @bulletin.deadline = nil + # @bulletin.update_user_id = current_user.id + # @bulletin.save! + # end # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) } format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) } format.js { render 'toggle_enable' } @@ -316,6 +319,16 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController protected + def delete_out_invalid_date_from_params() + if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? orparams[:bulletin]["deadline(3i)"].empty?) + params[:bulletin].delete("deadline(1i)") + params[:bulletin].delete("deadline(2i)") + params[:bulletin].delete("deadline(3i)") + params[:bulletin].delete("deadline(4i)") + params[:bulletin].delete("deadline(5i)") + end + end + def get_categorys(id = nil) @bulletin_categorys = [] #@unit_list_for_anc = UnitListForAnc.all From f66c3d9c0c4f1ce6008782cc8b40ea42f8fd8c9c Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 29 Jun 2012 11:17:35 +0800 Subject: [PATCH 17/32] fix bugs. --- .../panel/announcement/back_end/bulletins_controller.rb | 2 +- .../built_in_modules/announcement/app/models/bulletin.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index e2b8b7cf..a89b203b 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -320,7 +320,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController protected def delete_out_invalid_date_from_params() - if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? orparams[:bulletin]["deadline(3i)"].empty?) + if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? or params[:bulletin]["deadline(3i)"].empty?) params[:bulletin].delete("deadline(1i)") params[:bulletin].delete("deadline(2i)") params[:bulletin].delete("deadline(3i)") diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index 589da320..c083ecfe 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -50,7 +50,7 @@ class Bulletin validates_presence_of :title - before_save :set_key, :update_status + before_save :set_key, :update_status,:check_deadline after_save :save_bulletin_links after_save :save_bulletin_files @@ -159,6 +159,13 @@ class Bulletin protected + def check_deadline + if(!self.deadline.nil? and (self.deadline<= self.postdate )) + self.deadline = nil + end + + end + def set_key if title && title.new_record? title.key = 'title' From c0b3798bada8db8171d5db5c1552389f9bbb986a Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 29 Jun 2012 11:41:06 +0800 Subject: [PATCH 18/32] fix for date for qu menu --- .../panel/announcement/back_end/bulletins_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index a89b203b..f47b41bb 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -320,7 +320,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController protected def delete_out_invalid_date_from_params() - if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? or params[:bulletin]["deadline(3i)"].empty?) + if(params[:bulletin]["deadline(1i)"].blank? or params[:bulletin]["deadline(2i)"].blank? or params[:bulletin]["deadline(3i)"].blank?) params[:bulletin].delete("deadline(1i)") params[:bulletin].delete("deadline(2i)") params[:bulletin].delete("deadline(3i)") From 1278581a82b8894d2aa59a998e59a6eae8686cee Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 29 Jun 2012 17:42:36 +0800 Subject: [PATCH 19/32] add rescue job . can work with init script --- config/resque.god | 35 +++++++++++---------- config/resque_schedule.god | 63 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 17 deletions(-) create mode 100644 config/resque_schedule.god diff --git a/config/resque.god b/config/resque.god index aa9cb0b4..9fef461f 100644 --- a/config/resque.god +++ b/config/resque.god @@ -1,29 +1,29 @@ #developer pls change here -default_uid = 'kaito' -default_gid = 'staff' +rails_root = "/home/nccu/NCCU/" #keep this blank when development -rails_env = ENV['RAILS_ENV'] || "production" +development_uid = 'kaito' #when dev +development_gid = 'staff' #when dev +#rails_env = "developement" +rails_env = "production" -rails_root = ENV['RAILS_ROOT'] || File.expand_path("..",File.dirname(__FILE__)) +development_rails_root = File.expand_path("..",File.dirname(__FILE__)) +#rails_root = (rails_env == 'production' )? production_rails_root : development_rails_root num_workers = rails_env == 'production' ? 5 : 2 - num_workers.times do |num| God.watch do |w| - w.dir = "#{rails_root}" - w.name = "resque-#{num}" - w.group = 'resque' + w.dir = rails_root + w.name = "resque-#{num}" + w.group = 'resque' w.interval = 30.seconds - p "/usr/bin/rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env}" -# w.env = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env} - w.start = "rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env} -P /var/godgod.#{port}.pid" + w.env = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env} + w.start = "rake -f #{rails_root}/Rakefile resque:work QUEUE=* RAILS_ENV=#{rails_env}" - w.uid = rails_env == 'production' ? "nccu" : default_uid - w.gid = rails_env == 'production' ? "nccu" : default_gid - - - w.log = "#{rails_root}/log/god.log" + w.uid = (rails_env == 'production' )? "root" : development_uid + w.gid = (rails_env == 'production' )? "root" : development_gid + + w.log = (rails_env == 'production' )? "/var/log/#{w.name}.log":"#{rails_root}/log/#{w.name}.log" # restart if memory gets too high w.transition(:up, :restart) do |on| @@ -62,4 +62,5 @@ num_workers.times do |num| end end end -end \ No newline at end of file +end + diff --git a/config/resque_schedule.god b/config/resque_schedule.god new file mode 100644 index 00000000..34a6dff8 --- /dev/null +++ b/config/resque_schedule.god @@ -0,0 +1,63 @@ +#developer pls change here +rails_root = "/home/nccu/NCCU/" #keep this blank when development + +development_uid = 'kaito' #when dev +development_gid = 'staff' #when dev + +#rails_env = "developement" +rails_env = "production" + +development_rails_root = File.expand_path("..",File.dirname(__FILE__)) +#rails_root = (rails_env == 'production' )? production_rails_root : development_rails_root + + God.watch do |w| + w.dir = rails_root + w.name = "resque-scheduler" + w.group = 'resque' + w.interval = 30.seconds + w.env = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env} + w.start = "rake -f #{rails_root}/Rakefile resque:scheduler RAILS_ENV=#{rails_env}" + + w.uid = (rails_env == 'production' )? "root" : development_uid + w.gid = (rails_env == 'production' )? "root" : development_gid + + w.log = (rails_env == 'production' )? "/var/log/#{w.name}.log":"#{rails_root}/log/#{w.name}.log" + + # restart if memory gets too high + w.transition(:up, :restart) do |on| + on.condition(:memory_usage) do |c| + c.above = 350.megabytes + c.times = 2 + end + end + + # determine the state on startup + w.transition(:init, { true => :up, false => :start }) do |on| + on.condition(:process_running) do |c| + c.running = true + end + end + + # determine when process has finished starting + w.transition([:start, :restart], :up) do |on| + on.condition(:process_running) do |c| + c.running = true + c.interval = 5.seconds + end + + # failsafe + on.condition(:tries) do |c| + c.times = 5 + c.transition = :start + c.interval = 5.seconds + end + end + + # start if process is not running + w.transition(:up, :start) do |on| + on.condition(:process_running) do |c| + c.running = false + end + end + end + From 4014f8ee47c2c2ee139de2654011014f008cbdda Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 10:51:26 +0800 Subject: [PATCH 20/32] fix over queue at resque --- app/jobs/nccu_calendar.rb | 2 +- app/jobs/sync_db.rb | 5 +++-- config/resque_schedule.yml | 6 +++--- lib/tasks/mid_site_sync.rake | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/jobs/nccu_calendar.rb b/app/jobs/nccu_calendar.rb index e0676627..8756029d 100644 --- a/app/jobs/nccu_calendar.rb +++ b/app/jobs/nccu_calendar.rb @@ -16,6 +16,6 @@ end # FileUtils.mv(temp_file, File.join(Rails.root, 'public/static', 'nccu_calendar.xml')) - puts "NccuCalendar Synced4" + puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced" end end diff --git a/app/jobs/sync_db.rb b/app/jobs/sync_db.rb index f6e734cf..9c92e816 100644 --- a/app/jobs/sync_db.rb +++ b/app/jobs/sync_db.rb @@ -3,6 +3,7 @@ class SyncDb @queue = :high def self.perform() + puts "[ #{DateTime.now.strftime("%Y %D %H:%M") }]\t SyncDb Starting" self.start_sync self.set_admin end @@ -12,13 +13,13 @@ class SyncDb args = [] %x[rake #{task} --trace >> #{Rails.root}/log/rake.log] User.all.each{|ur| ur.create_dept_cache} - puts "SyncDb Synced" + puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]\tSyncDb Synced" end def self.set_admin task = 'mid_site:install_admin' args = [] %x[rake #{task} --trace >> #{Rails.root}/log/rake.log] - puts "Admin done" + puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]\tAdmin done" end end diff --git a/config/resque_schedule.yml b/config/resque_schedule.yml index 27af98fa..67d006ed 100644 --- a/config/resque_schedule.yml +++ b/config/resque_schedule.yml @@ -5,19 +5,19 @@ # description: Runs the perform method in FetchTime nccu_daily_ldap_sync: - cron: * * [0,12] * * * + cron: 0 0 [0,12] * * * class: SyncDb args: description: Sync NCCU middle site with Orbit for LDAP data nccu_daily_backup: - cron: * * 3 * * * + cron: 0 0 3 * * * class: BackupServer args: description: Backup NCCU site nccu_claender_sync: - cron: * * [0,12] * * * + cron: 0 0 [0,12] * * * class: NccuCalendar args: description: Sync NCCU calendar RSS Feeds \ No newline at end of file diff --git a/lib/tasks/mid_site_sync.rake b/lib/tasks/mid_site_sync.rake index 87979b66..69e93567 100644 --- a/lib/tasks/mid_site_sync.rake +++ b/lib/tasks/mid_site_sync.rake @@ -36,6 +36,7 @@ namespace :mid_site do local_need_remove = User.all.collect{|t| t.nccu_id rescue nil}.uniq.delete_if {|x| x == nil} - remote_list desc "Going to delete User with IDs: #{local_need_remove.inspect}" local_need_remove = User.excludes(nccu_ldap_uid: test_account_ldap_id ).collect{|t| t.nccu_ldap_uid rescue nil}.uniq.delete_if {|x| x == nil} - remote_list + AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy} desc "Deletion completed! \n" #starting update user @@ -77,6 +78,7 @@ namespace :mid_site do local_user.save! end + end From 4fe92b844e8abd9963f29ba4795c3d9950761c2f Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 15:47:28 +0800 Subject: [PATCH 21/32] Add sorting order for NCCU request --- lib/tasks/data_migration.rake | 12 ++++++++++++ .../announcement/widget/bulletins_controller.rb | 2 +- .../announcement/app/models/announcement_tag.rb | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 lib/tasks/data_migration.rake diff --git a/lib/tasks/data_migration.rake b/lib/tasks/data_migration.rake new file mode 100644 index 00000000..4e5b519c --- /dev/null +++ b/lib/tasks/data_migration.rake @@ -0,0 +1,12 @@ +require 'resque_scheduler/tasks' +# encoding: utf-8 + +namespace :data_migration do + + task :add_order_to_announcement_tag_0703 => :environment do + AnnouncementTag.first({conditions:{ key: 'students' }}).update_attributes(:order=>1) + AnnouncementTag.first({conditions:{ key: 'alumni' }}).update_attributes(:order=>2) + AnnouncementTag.first({conditions:{ key: 'employee' }}).update_attributes(:order=>3) + AnnouncementTag.first({conditions:{ key: 'guest' }}).update_attributes(:order=>4) + end +end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 316a715b..dbd8844f 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -27,7 +27,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController end def bulletins_and_web_links - @tags = AnnouncementTag.any_in(key: ['students', 'alumni', 'employee', 'guest']) + @tags = AnnouncementTag.any_in(key: ['students', 'alumni', 'employee', 'guest']).asc(:order) @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil diff --git a/vendor/built_in_modules/announcement/app/models/announcement_tag.rb b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb index 9cb29038..8bc390eb 100644 --- a/vendor/built_in_modules/announcement/app/models/announcement_tag.rb +++ b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb @@ -1,7 +1,7 @@ class AnnouncementTag < Tag has_and_belongs_to_many :bulletins - + field :order,:default => 0 def get_visible_bulletins(sort = :name) date_now = Time.now From 56ecf9c69b7668858e041cd724efb51c67352730 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 15:59:25 +0800 Subject: [PATCH 22/32] remove remember for nccu --- app/views/devise/sessions/new.html.erb | 6 ------ app/views/layouts/_orbit_bar.html.erb | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 4eee59d8..26ca7599 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -24,12 +24,6 @@
      -
      - -
      <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary pull-right' %>
      <% end %> diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index a661dd66..4b74ab28 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -94,10 +94,7 @@
    • <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %> - +
    • <%= t(:or_lower) %>
      • <% end %> From d0632b2e4ce6301f7811c3399a3f4ad2f8acca7c Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 16:05:19 +0800 Subject: [PATCH 23/32] change name format --- app/models/user/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 4f820c16..46dc1040 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -72,7 +72,7 @@ class User if info first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil - return "#{first_name} #{last_name}" + return "#{last_name} #{first_name}" else return nil end From 9607b5bbfd53212b2ecc711311aa8529a8f06b8c Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 18:12:44 +0800 Subject: [PATCH 24/32] =?UTF-8?q?rulingcom=E5=B8=B3=E8=99=9F=E4=B8=8D?= =?UTF-8?q?=E9=80=8F=E9=81=8ELDAP=E8=AA=8D=E8=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/sessions_controller.rb | 77 +++++++++++++++----------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 77680e5b..be961ac2 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -12,42 +12,53 @@ class SessionsController < Devise::SessionsController login_uid = params[:user][:nccu_ldap_uid] result = false ldap_filter = "(uid=#{login_uid})" - if $nccu_ldap_connection.bind - logger.info "=LDAP Binded password ok..." - result =check_auth_with_ldap(login_uid,login_password) - if result && login_password!='' - logger.info "==LDAP password passed..." - nccu_id = get_nccu_id_from_mid_site(login_uid) - resource = nccu_id.nil? ? nil : (User.first(conditions:{ nccu_ldap_uid: nccu_id })) - # resource = env['warden'].authenticate!(:check_nccu_ldap) - # resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new") - set_flash_message(:notice, :signed_in) if is_navigational_format? - if (resource.nil? || nccu_id.nil?) - logger.error "===LDAP passed local block... resource:#{resource.inspect}\n nccu_id:#{nccu_id} \t login_uid:#{login_uid}" - flash[:notice] = t('devise.failure.ldap_pass_but_account_not_in_orbit') - render :action => "new" - else - logger.info "===ALL passed" - resource_name = resource._type.downcase - sign_in(resource_name, resource) - respond_with resource, :location => redirect_location(resource_name, resource) - end - elsif resource = User.first(conditions:{email: login_uid}) + if User.first({conditions:{ email: login_uid}}).nil? - resource_name = resource._type.downcase - sign_in(resource_name, resource) - respond_with resource, :location => redirect_location(resource_name, resource) + if ($nccu_ldap_connection.bind rescue false) + logger.info "=LDAP Binded password ok..." + result =check_auth_with_ldap(login_uid,login_password) + if result && login_password!='' + logger.info "==LDAP password passed..." + nccu_id = get_nccu_id_from_mid_site(login_uid) + resource = nccu_id.nil? ? nil : (User.first(conditions:{ nccu_ldap_uid: nccu_id })) + # resource = env['warden'].authenticate!(:check_nccu_ldap) + # resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new") + set_flash_message(:notice, :signed_in) if is_navigational_format? + if (resource.nil? || nccu_id.nil?) + logger.error "===LDAP passed local block... resource:#{resource.inspect}\n nccu_id:#{nccu_id} \t login_uid:#{login_uid}" + flash[:notice] = t('devise.failure.ldap_pass_but_account_not_in_orbit') + render :action => "new" + else + logger.info "===ALL passed" + resource_name = resource._type.downcase + sign_in(resource_name, resource) + respond_with resource, :location => redirect_location(resource_name, resource) + end + else + logger.error "==password LDAP fail..." + flash[:notice] = t('devise.failure.ldap_invalid') + render :action => "new" + end else - logger.error "==password LDAP fail..." - flash[:notice] = t('devise.failure.ldap_invalid') - render :action => "new" + logger.error "=LDAP fail..." + flash[:notice] = t('devise.failure.ldap_connection_failed') + render :action => "new" end - else - logger.error "=LDAP fail..." - flash[:notice] = t('devise.failure.ldap_connection_failed') - render :action => "new" - end - logger.info "=======End Debugging======" + else #if rulingcom account + logger.info "=======Rulingcom account======" + resource = User.first(conditions:{email: login_uid}) + if resource.valid_password?(params[:user][:password]) + resource_name = resource._type.downcase + sign_in(resource_name, resource) + respond_with resource, :location => redirect_location(resource_name, resource) + else + logger.error "==password Local fail..." + flash[:notice] = t('devise.failure.invalid') + render :action => "new" + end + end + logger.info "=======End Debugging======" + end private def check_auth_with_ldap(login_uid,login_password) From f7107936d077999100f76678aef7a15e4d34908a Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 3 Jul 2012 18:21:48 +0800 Subject: [PATCH 25/32] fix for checking @rulingcom.com --- app/controllers/sessions_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index be961ac2..23a89c38 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -12,7 +12,7 @@ class SessionsController < Devise::SessionsController login_uid = params[:user][:nccu_ldap_uid] result = false ldap_filter = "(uid=#{login_uid})" - if User.first({conditions:{ email: login_uid}}).nil? + if /@rulingcom.com$/.match(login_uid).nil? if ($nccu_ldap_connection.bind rescue false) logger.info "=LDAP Binded password ok..." @@ -47,7 +47,7 @@ class SessionsController < Devise::SessionsController else #if rulingcom account logger.info "=======Rulingcom account======" resource = User.first(conditions:{email: login_uid}) - if resource.valid_password?(params[:user][:password]) + if resource.valid_password?(login_password) resource_name = resource._type.downcase sign_in(resource_name, resource) respond_with resource, :location => redirect_location(resource_name, resource) From ae2cbb728eafb09a6a757b2961195400f7a2cf45 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 4 Jul 2012 17:36:51 +0800 Subject: [PATCH 26/32] archive for announcement --- app/views/layouts/_side_bar.html.erb | 5 +++++ lib/orbit_core_lib.rb | 2 +- .../back_end/bulletin_categorys_controller.rb | 19 +++++++++++++------ .../back_end/bulletins_controller.rb | 17 ++++++++--------- .../back_end/bulletin_categorys_helper.rb | 4 ++++ .../app/models/bulletin_category.rb | 15 +++++++++++++-- .../_bulletin_category.html.erb | 2 +- .../bulletin_categorys/destroy.js.erb | 2 +- .../announcement/config/locales/zh_tw.yml | 5 +++++ 9 files changed, 51 insertions(+), 20 deletions(-) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 26925aee..c0507e67 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -75,3 +75,8 @@ <%#= content_tag :li, link_to(t('admin.tags'), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %> <%# end -%> <%# end -%> +
      + <% flash.each do |key, msg| %> + <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %> + <% end%> +
      \ No newline at end of file diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index f3cd2cd5..8e333b7e 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -14,7 +14,7 @@ module OrbitCoreLib query1 = auth_object_space.any_in({sub_role_ids: sub_role_ids_ary}).excludes(blocked_user_ids: user.id) query2 = auth_object_space.any_of({all: true},{privilege_user_ids: user.id},{role_ids: user.role.id}).excludes(blocked_user_ids: user.id) result = (query1 + query2).uniq - result.collect{|t| t.obj_authable} + result.collect{|t| t.obj_authable}.delete_if{|val| val==nil} end end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index b1ce1718..9ba78b90 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -107,13 +107,20 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo # DELETE /bulletins/1 # DELETE /bulletins/1.xml def destroy - @bulletin_category = BulletinCategory.find(params[:id]) - @bulletin_category.destroy + @bulletin_category = BulletinCategory.find(params[:id]).first + @bulletin_category.disable = @bulletin_category.disable ? false : true - respond_to do |format| - format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url) } - # format.xml { head :ok } - format.js + if @bulletin_category.save! + respond_to do |format| + flash[:notice] = t("bulletin_category.update_success") + # flash[:error] += @bulletin_category.disable ? t("bulletin_category.disable_change_to_true") : t("bulletin_category.disable_change_to_false") + format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url) } + # format.xml { head :ok } + format.js + end + else + flash[:error] = t("bulletin_category.update_failed") + format.html { render :action => "index" } end end end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index f47b41bb..1b6b4336 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -3,6 +3,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController layout 'new_admin' before_filter :authenticate_user! + before_filter :get_categorys ,:only => [ :new,:edit,:update] # before_filter :for_admin_only,:only => [:] # before_filter :for_app_manager,:only => [:index,:show,] before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins] @@ -83,15 +84,10 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletin.bulletin_files.build # @bulletin.bulletin_files.new - if get_categorys.empty? - flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") - redirect_to :action => :index - else get_tags respond_to do |format| format.html # new.html.erb format.xml { render :xml => @bulletin } - end end end @@ -105,7 +101,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @link_url = panel_announcement_back_end_bulletin_path(@bulletin) - get_categorys get_tags end end @@ -268,7 +263,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController format.xml { head :ok } else get_tags - get_categorys + format.html { render :action => "edit" } format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity } end @@ -333,9 +328,13 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin_categorys = [] #@unit_list_for_anc = UnitListForAnc.all if(is_manager? || is_admin?) - @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) + @bulletin_categorys = (id ? BulletinCategory.available.find(id).to_a : BulletinCategory.available) elsif is_sub_manager? - @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit') + @bulletin_categorys = BulletinCategory.available.authed_for_user(current_user,'submit') + end + if @bulletin_categorys.empty? && params[:action] != "index" + flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") + redirect_to :action => :index end end diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb index 92604985..ea413b54 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb @@ -13,4 +13,8 @@ include ActionView::Helpers::UrlHelper link_to t('announcement.bulletin.cate_auth'),admin_object_auth_ob_auth_path(oa) end + def show_toggle_archive_btn(bulletin_category) + bulletin_category.disable ? t("bulletin_category.disable_change_to_true") : t("bulletin_category.disable_change_to_false") + end + end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb index feb39edb..a5686cc1 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb @@ -14,11 +14,22 @@ class BulletinCategory field :key field :display - + field :disable,type: Boolean,:default => false + has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy - has_many :bulletins,:dependent => :destroy + has_many :bulletins + scope :available,where(disable: false) + + def self.find(*args) + if args ==[:all] + unscoped + else + unscoped.find(args) + end + end + def pp_object i18n_variable[I18n.locale] end diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb index 6b98e466..58a9a5f9 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb @@ -6,7 +6,7 @@
        <% if is_admin?%>
      • <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
        • -
      • <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
        • +
      • <%= link_to show_toggle_archive_btn(bulletin_category) , panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=> "archive_toggle" %>
        • <% end %> <%if is_manager? || is_admin? %>
      • <%= show_anc_cate_permission_link(bulletin_category) %>
        • diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb index 882b13d2..e7f79190 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb @@ -1 +1 @@ -$("#<%= dom_id @bulletin_category %>").remove(); \ No newline at end of file +$("#<%= dom_id @bulletin_category %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@bulletin_category) %> "); \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index af1364a9..6aa1d15b 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -79,6 +79,7 @@ zh_tw: fact_check: 公告審核 delete: 刪除 edit: 編輯 + # action: 行動 # add_language: 新增語言 # admin: 管理 @@ -178,6 +179,10 @@ zh_tw: bulletin_category: edit: 修改 delete: 刪除 + update_success: 分類更新成功 + update_failed: 分類更新失敗 + disable_change_to_false: 設為停用 + disable_change_to_true: 重新啓用 # Chinese (Taiwan) translations for Ruby on Rails # by tsechingho (http://github.com/tsechingho) From 32480e10ed4deafe86aa51fc720043d3bac3c21e Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 4 Jul 2012 17:43:52 +0800 Subject: [PATCH 27/32] en translation --- .../built_in_modules/announcement/config/locales/en.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 4d4d426d..5e60f17b 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -85,7 +85,14 @@ en: cate_auth: Category Authorization submit_approval: Submit approval tag_cloud: Tag cloud - + + bulletin_category: + edit: Edit + delete: Delete + update_success: Bulletin Category Updated + update_failed: Bulletin Category Failed + disable_change_to_false: Toggle to archive + disable_change_to_true: Pu back from archive # admin: # action: Action # add_language: Add language From edef51d58c68aaca3b478489a30c40ce0b527b86 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 4 Jul 2012 17:56:51 +0800 Subject: [PATCH 28/32] DM for archive bulletin categroy --- lib/tasks/data_migration.rake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/tasks/data_migration.rake b/lib/tasks/data_migration.rake index 4e5b519c..ff132c4a 100644 --- a/lib/tasks/data_migration.rake +++ b/lib/tasks/data_migration.rake @@ -9,4 +9,14 @@ namespace :data_migration do AnnouncementTag.first({conditions:{ key: 'employee' }}).update_attributes(:order=>3) AnnouncementTag.first({conditions:{ key: 'guest' }}).update_attributes(:order=>4) end + + task :add_archive_func_to_bulletin_category_0704 => :environment do + BulletinCategory.all.each{|bc| bc.disable=false;bc.save!} + end + + + task :add_archive_func_to_news_bulletin_category_0704 => :environment do + NewsBulletinCategory.all.each{|bc| bc.disable=false;bc.save!} + end + end \ No newline at end of file From c5fdff764e8bd574e4261800533a6b420cdc7318 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Jul 2012 16:00:45 +0800 Subject: [PATCH 29/32] orbit disable object for categories --- app/controllers/sessions_controller.rb | 4 ++-- app/helpers/orbit_backend_helper.rb | 4 ++++ config/locales/zh_tw.yml | 4 ++++ lib/orbit_controller_lib.rb | 11 +++++++++ lib/orbit_core_lib.rb | 15 ++++++++++++ .../back_end/bulletin_categorys_controller.rb | 3 ++- .../back_end/bulletins_controller.rb | 7 ++++-- .../widget/bulletins_controller.rb | 2 +- .../back_end/bulletin_categorys_helper.rb | 4 ---- .../app/models/bulletin_category.rb | 11 ++------- .../announcement/config/locales/en.yml | 2 +- .../announcement/config/locales/zh_tw.yml | 2 -- .../news_bulletin_categorys_controller.rb | 24 +++++++++++++------ .../back_end/news_bulletins_controller.rb | 24 +++++++++++-------- .../news/app/models/news_bulletin_category.rb | 6 ++--- .../_news_bulletin_category.html.erb | 2 +- .../news_bulletin_categorys/destroy.js.erb | 2 +- .../news/config/locales/zh_tw.yml | 4 ++++ .../app/models/web_link_category.rb | 2 +- .../_web_link_category.html.erb | 2 +- 20 files changed, 89 insertions(+), 46 deletions(-) create mode 100644 lib/orbit_controller_lib.rb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 23a89c38..748c225c 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,8 +1,6 @@ class SessionsController < Devise::SessionsController prepend_before_filter :require_no_authentication, :only => [ :new, :create ] include Devise::Controllers::InternalHelpers - MiddleSiteConnection.establish - NccuLdapConnection.establish # POST /resource/sign_in def create @@ -13,6 +11,8 @@ class SessionsController < Devise::SessionsController result = false ldap_filter = "(uid=#{login_uid})" if /@rulingcom.com$/.match(login_uid).nil? + MiddleSiteConnection.establish + NccuLdapConnection.establish if ($nccu_ldap_connection.bind rescue false) logger.info "=LDAP Binded password ok..." diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 5d47e414..e2865b9f 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -42,4 +42,8 @@ module OrbitBackendHelper end end + def show_toggle_archive_btn(object) + object.disable ? t("object_disable.change_to_false") : t("object_disable.change_to_true") + end + end \ No newline at end of file diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 930f5902..09877234 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -511,3 +511,7 @@ zh_tw: sys: not_previewable: "不支援預覽" limit_of_upload_file_size: "上傳檔案大小限制: %{best_size}" + + object_disable: + change_to_true: "設為停用" + change_to_false: "重新啓用" \ No newline at end of file diff --git a/lib/orbit_controller_lib.rb b/lib/orbit_controller_lib.rb new file mode 100644 index 00000000..c0e7031c --- /dev/null +++ b/lib/orbit_controller_lib.rb @@ -0,0 +1,11 @@ +module OrbitControllerLib + module DivisionForDisable + def get_disable_object_by_user(object_class) + if is_admin? or is_manager? + object_class.admin_manager_all + else + object_class.all + end + end + end +end diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index 8e333b7e..2c24c82f 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -1,4 +1,19 @@ module OrbitCoreLib + module ObjectDisable + def self.included(base) + + base.instance_eval("field :disable,type: Boolean,:default => false") + base.instance_eval("scope :all,where(disable: false)") + base.instance_eval("scope :admin_manager_all,find(:all)") + base.define_singleton_method :find do |*args| + if args ==[:all] + unscoped + else + unscoped.find(args) + end + end + end + end module ObjectAuthable def self.included(base) base.instance_eval("has_many :object_auths,as: :obj_authable,dependent: :delete") diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index 9ba78b90..e3fe50bc 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -1,9 +1,10 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController - + include OrbitControllerLib::DivisionForDisable before_filter :for_app_manager,:except => [:index] def index @bulletin_categorys = BulletinCategory.all + #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 @bulletin_category = BulletinCategory.new(:display => 'List') @url = panel_announcement_back_end_bulletin_categorys_path diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 1b6b4336..40a6ff18 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -39,6 +39,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10) @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : get_viewable("bulletin") @bulletin_categories = BulletinCategory.all + #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 @bulletin_link = BulletinLink.new @link_url = panel_announcement_back_end_bulletins_path @@ -301,6 +302,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin = Bulletin.find(params[:id]) @type = params[:type] @bulletin_categories = BulletinCategory.all + #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 + get_tags end @@ -328,9 +331,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin_categorys = [] #@unit_list_for_anc = UnitListForAnc.all if(is_manager? || is_admin?) - @bulletin_categorys = (id ? BulletinCategory.available.find(id).to_a : BulletinCategory.available) + @bulletin_categorys = (id ? BulletinCategory.all.find(id).to_a : BulletinCategory.all) elsif is_sub_manager? - @bulletin_categorys = BulletinCategory.available.authed_for_user(current_user,'submit') + @bulletin_categorys = BulletinCategory.all.authed_for_user(current_user,'submit') end if @bulletin_categorys.empty? && params[:action] != "index" flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index dbd8844f..8a39862b 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -52,7 +52,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController protected def get_categorys - @bulletin_categorys = BulletinCategory.excludes('disabled' => true) + @bulletin_categorys = BulletinCategory.all end end diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb index ea413b54..92604985 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb @@ -13,8 +13,4 @@ include ActionView::Helpers::UrlHelper link_to t('announcement.bulletin.cate_auth'),admin_object_auth_ob_auth_path(oa) end - def show_toggle_archive_btn(bulletin_category) - bulletin_category.disable ? t("bulletin_category.disable_change_to_true") : t("bulletin_category.disable_change_to_false") - end - end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb index a5686cc1..2f25c888 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb @@ -4,7 +4,8 @@ class BulletinCategory include Mongoid::Document include Mongoid::Timestamps include OrbitCoreLib::ObjectAuthable - + include OrbitCoreLib::ObjectDisable + ObjectAuthTitlesOptions = %W{submit_new fact_check} AfterObjectAuthUrl = '/panel/announcement/back_end/bulletin_categorys' # include Mongoid::MultiParameterAttributes @@ -20,15 +21,7 @@ class BulletinCategory has_many :bulletins - scope :available,where(disable: false) - def self.find(*args) - if args ==[:all] - unscoped - else - unscoped.find(args) - end - end def pp_object i18n_variable[I18n.locale] diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 5e60f17b..3d941335 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -92,7 +92,7 @@ en: update_success: Bulletin Category Updated update_failed: Bulletin Category Failed disable_change_to_false: Toggle to archive - disable_change_to_true: Pu back from archive + disable_change_to_true: Put back from archive # admin: # action: Action # add_language: Add language diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index 6aa1d15b..55931284 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -181,8 +181,6 @@ zh_tw: delete: 刪除 update_success: 分類更新成功 update_failed: 分類更新失敗 - disable_change_to_false: 設為停用 - disable_change_to_true: 重新啓用 # Chinese (Taiwan) translations for Ruby on Rails # by tsechingho (http://github.com/tsechingho) diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb index e3ac7476..1b54c799 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb @@ -4,7 +4,9 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendContro def index - @news_bulletin_categorys = NewsBulletinCategory.all + @news_bulletin_categorys = get_disable_object_by_user(NewsBulletinCategory) + #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 + @news_bulletin_category = NewsBulletinCategory.new(:display => 'List') @url = panel_news_back_end_news_bulletin_categorys_path @@ -108,13 +110,21 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendContro # DELETE /news_bulletins/1 # DELETE /news_bulletins/1.xml def destroy - @news_bulletin_category = NewsBulletinCategory.find(params[:id]) - @news_bulletin_category.destroy + @news_bulletin_category = NewsBulletinCategory.find(params[:id]).first + @news_bulletin_category.disable = @news_bulletin_category.disable ? false : true + + if @news_bulletin_category.save! + respond_to do |format| + flash[:notice] = t("bulletin_category.update_success") + # flash[:error] += @bulletin_category.disable ? t("bulletin_category.disable_change_to_true") : t("bulletin_category.disable_change_to_false") + format.html { redirect_to(panel_announcement_back_end_news_bulletin_categorys_url) } + # format.xml { head :ok } + format.js + end + else + flash[:error] = t("bulletin_category.update_failed") + format.html { render :action => "index" } - respond_to do |format| - format.html { redirect_to(panel_news_back_end_news_bulletin_categorys_url) } - # format.xml { head :ok } - format.js end end end diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb index b8fa7cc8..7e28f717 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb @@ -5,7 +5,8 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController # before_filter :for_admin_only,:only => [:] # before_filter :for_app_manager,:only => [:index,:show,] before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_news_bulletins] - + before_filter :get_categorys ,:only => [ :new,:edit,:update] + def index # @news_bulletins = NewsBulletin.all # @news_bulletins = NewsBulletin.desc("postdate desc") @@ -38,6 +39,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController # @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_news_bulletins : NewsBulletin.all.page(params[:page]).per(10) @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("news_bulletin") : get_viewable("news_bulletin") @news_bulletin_categories = NewsBulletinCategory.all + #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 @news_bulletin_link = NewsBulletinLink.new @link_url = panel_news_back_end_news_bulletins_path @@ -82,15 +84,11 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController # @news_bulletin.news_bulletin_files.build # @news_bulletin.news_bulletin_files.new - if get_categorys.empty? - flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") - redirect_to :action => :index - else + get_tags respond_to do |format| format.html # new.html.erb format.xml { render :xml => @news_bulletin } - end end end @@ -104,7 +102,6 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController @link_url = panel_news_back_end_news_bulletin_path(@news_bulletin) - get_categorys get_tags end end @@ -264,7 +261,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController format.xml { head :ok } else get_tags - get_categorys + format.html { render :action => "edit" } format.xml { render :xml => @news_bulletin.errors, :status => :unprocessable_entity } end @@ -303,6 +300,8 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController @news_bulletin = NewsBulletin.find(params[:id]) @type = params[:type] @news_bulletin_categories = NewsBulletinCategory.all + #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 + get_tags end @@ -320,11 +319,16 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController @news_bulletin_categorys = [] @unit_list_for_anc = UnitListForAnc.all if(is_manager? || is_admin?) - @news_bulletin_categorys = (id ? NewsBulletinCategory.find(id).to_a : NewsBulletinCategory.excludes('disabled' => true)) + @news_bulletin_categorys = (id ? NewsBulletinCategory.find(id).to_a : NewsBulletinCategory.all) elsif is_sub_manager? - @news_bulletin_categorys = NewsBulletinCategory.authed_for_user(current_user,'submit') + @news_bulletin_categorys = NewsBulletinCategory.all.authed_for_user(current_user,'submit') end + if @news_bulletin_categorys.empty? && params[:action] != "index" + flash[:alert] = t("news.error.no_avilb_cate_for_posting") + redirect_to :action => :index + end end + def get_tags module_app = ModuleApp.first(:conditions => {:key => 'news'}) diff --git a/vendor/built_in_modules/news/app/models/news_bulletin_category.rb b/vendor/built_in_modules/news/app/models/news_bulletin_category.rb index c1f60e91..79443f82 100644 --- a/vendor/built_in_modules/news/app/models/news_bulletin_category.rb +++ b/vendor/built_in_modules/news/app/models/news_bulletin_category.rb @@ -4,7 +4,8 @@ class NewsBulletinCategory include Mongoid::Document include Mongoid::Timestamps include OrbitCoreLib::ObjectAuthable - + include OrbitCoreLib::ObjectDisable + ObjectAuthTitlesOptions = %W{submit_new fact_check} AfterObjectAuthUrl = '/panel/news/back_end/news_bulletin_categorys' # include Mongoid::MultiParameterAttributes @@ -16,8 +17,7 @@ class NewsBulletinCategory field :display has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy - - has_many :news_bulletins,:dependent => :destroy + has_many :news_bulletins def pp_object i18n_variable[I18n.locale] diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb index f96f8fb4..4c231c31 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb @@ -6,7 +6,7 @@
          <% if is_admin?%>
        • <%= link_to t('bulletin_category.edit'), edit_panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :remote => true %>
          • -
        • <%= link_to t('bulletin_category.delete'), panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
          • +
        • <%= link_to show_toggle_archive_btn(news_bulletin_category), panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %>
          • <% end %> <%if is_manager? || is_admin? %>
        • <%= show_news_cate_permission_link(news_bulletin_category) %>
          • diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/destroy.js.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/destroy.js.erb index 0ffa06b1..e2acc583 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/destroy.js.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/destroy.js.erb @@ -1 +1 @@ -$("#<%= dom_id @news_bulletin_category %>").remove(); \ No newline at end of file +$("#<%= dom_id @news_bulletin_category %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@news_bulletin_category) %> "); \ No newline at end of file diff --git a/vendor/built_in_modules/news/config/locales/zh_tw.yml b/vendor/built_in_modules/news/config/locales/zh_tw.yml index 7dc117cd..9d0030d2 100644 --- a/vendor/built_in_modules/news/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/news/config/locales/zh_tw.yml @@ -75,6 +75,10 @@ zh_tw: fact_check: 新聞審核 delete: 刪除 edit: 編輯 + update_success: 分類更新成功 + update_failed: 分類更新失敗 + + # action: 行動 # add_language: 新增語言 # admin: 管理 diff --git a/vendor/built_in_modules/web_resource/app/models/web_link_category.rb b/vendor/built_in_modules/web_resource/app/models/web_link_category.rb index f9ef5989..53a10a1a 100644 --- a/vendor/built_in_modules/web_resource/app/models/web_link_category.rb +++ b/vendor/built_in_modules/web_resource/app/models/web_link_category.rb @@ -4,7 +4,7 @@ class WebLinkCategory include Mongoid::Document include Mongoid::Timestamps include OrbitCoreLib::ObjectAuthable - + include OrbitCoreLib::ObjectDisable # include Mongoid::MultiParameterAttributes AfterObjectAuthUrl = '/panel/page_content/back_end/page_contexts' APP_NAME = 'web_resource' diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb index 66a772cf..f9f52e7d 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb @@ -7,7 +7,7 @@
          • <%= link_to t('web_resource.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %>
            • -
          • <%= link_to t('web_resource.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
            • +
          • <%= link_to show_toggle_archive_btn(web_link_category), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
          • <%= show_web_link_permission_link web_link_category %>
          From 56caf4b34e6847a8b48e4fdc588ef0b2df26a1c4 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 6 Jul 2012 18:11:55 +0800 Subject: [PATCH 30/32] category disable for backend --- app/controllers/orbit_backend_controller.rb | 8 ++- config/initializers/middle_site_connection.rb | 8 +-- lib/orbit_controller_lib.rb | 43 ++++++++++++-- lib/orbit_core_lib.rb | 13 ++++- .../back_end/approvals_controller.rb | 16 +++--- .../back_end/bulletin_categorys_controller.rb | 5 +- .../back_end/bulletins_controller.rb | 51 ++++++++++------- .../news_bulletin_categorys_controller.rb | 6 +- .../back_end/news_bulletins_controller.rb | 57 ++++++++++++------- .../back_end/web_link_categorys_controller.rb | 19 +++++-- .../back_end/web_links_controller.rb | 48 +++++++++++----- .../_web_link_category.html.erb | 2 +- .../web_link_categorys/destroy.js.erb | 2 +- 13 files changed, 190 insertions(+), 88 deletions(-) diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index 28f99fa2..feefc98e 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -154,15 +154,17 @@ class OrbitBackendController< ApplicationController end - def get_viewable(object_class) - objects = get_objects(object_class).order_by(:created_at, :desc) + def get_viewable(object_class, query=nil) + objects = get_objects(object_class,query).order_by(:created_at, :desc) Kaminari.paginate_array(objects).page(params[:page]).per(10) end def get_objects(object_class, query=nil) object_class = object_class.classify.constantize + # debugger + # a=1 if query - objects = object_class.all.where(query) + objects = object_class.where(query) else objects = object_class.all end diff --git a/config/initializers/middle_site_connection.rb b/config/initializers/middle_site_connection.rb index 345ad464..1b99224a 100644 --- a/config/initializers/middle_site_connection.rb +++ b/config/initializers/middle_site_connection.rb @@ -6,10 +6,10 @@ $mid_site_connection module MiddleSiteConnection @mid_host = { - :host => 'mruling.nccu.edu.tw', #mruling.nccu.edu.tw or 127.0.0.1 - :port => 3306, #3306 or 8005 - :username => "rulingcom", - :password => "5w3iJQ9OJQMGhJibKP6YQje8", + :host => '127.0.0.1', #mruling.nccu.edu.tw or 127.0.0.1 + :port => 8005, #3306 or 8005 + :username => "root", + :password => "a3G6yWd9", :database => "RSS23_NCCU_MIDDLE", :encoding => "UTF8" } diff --git a/lib/orbit_controller_lib.rb b/lib/orbit_controller_lib.rb index c0e7031c..e8fd8e05 100644 --- a/lib/orbit_controller_lib.rb +++ b/lib/orbit_controller_lib.rb @@ -1,11 +1,44 @@ module OrbitControllerLib module DivisionForDisable - def get_disable_object_by_user(object_class) - if is_admin? or is_manager? - object_class.admin_manager_all - else - object_class.all + # def get_disable_object_by_user(object_class) + # if is_admin? or is_manager? + # object_class.admin_manager_all + # else + # object_class.all + # end + # end + + + def get_categories_for_index(object_class,id = nil) + class_ref = object_class.constantize + ivar_name = "@#{object_class.to_s.underscore.pluralize}" + instance_variable_set(ivar_name, []) + if(is_manager? || is_admin?) + instance_variable_set(ivar_name, (id ? class_ref.admin_manager_all.find(id).to_a : class_ref.admin_manager_all)) + elsif is_sub_manager? + instance_variable_set(ivar_name, (class_ref.all)) + end + instance_variable_get(ivar_name) + end + + def get_categorys(object_class,id = nil,func_authed_for_sub_manager = 'submit') + class_ref = object_class.constantize + # ivar_name = "@#{object_class.to_s.underscore.pluralize}" + ivar_name = "@#{object_class.to_s.underscore}s" + instance_variable_set(ivar_name, []) + @bulletin_categorys = [] + if(is_manager? || is_admin?) + #instance_variable_set(ivar_name, (id ? class_ref.admin_manager_all.find(id).to_a : class_ref.admin_manager_all)) + instance_variable_set(ivar_name, (id ? class_ref.all.find(id).to_a : class_ref.all)) + elsif is_sub_manager? + instance_variable_set(ivar_name, class_ref.all.authed_for_user(current_user,func_authed_for_sub_manager)) + end + if instance_variable_get(ivar_name).empty? && params[:action] != "index" + flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") + redirect_to :action => :index end end + + end end diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index 2c24c82f..5c32e507 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -5,13 +5,24 @@ module OrbitCoreLib base.instance_eval("field :disable,type: Boolean,:default => false") base.instance_eval("scope :all,where(disable: false)") base.instance_eval("scope :admin_manager_all,find(:all)") + base.define_singleton_method :find do |*args| if args ==[:all] unscoped else - unscoped.find(args) + res = unscoped.find(args) + res.count == 1 ? res[0] : res end end + + base.define_singleton_method :first do |*args| + all.first + end + + base.define_singleton_method :last do |*args| + all.last + end + end end module ObjectAuthable diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb index a41c27ac..dc4f2de6 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb @@ -51,12 +51,12 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle object_auth end - def get_categorys(id = nil) - @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_categorys(id = nil) + # @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 end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index e3fe50bc..56de2104 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -3,10 +3,9 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo before_filter :for_app_manager,:except => [:index] def index - @bulletin_categorys = BulletinCategory.all + @bulletin_categorys = get_categories_for_index("BulletinCategory") #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 @bulletin_category = BulletinCategory.new(:display => 'List') - @url = panel_announcement_back_end_bulletin_categorys_path respond_to do |format| @@ -108,7 +107,7 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo # DELETE /bulletins/1 # DELETE /bulletins/1.xml def destroy - @bulletin_category = BulletinCategory.find(params[:id]).first + @bulletin_category = BulletinCategory.find(params[:id]) @bulletin_category.disable = @bulletin_category.disable ? false : true if @bulletin_category.save! diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 40a6ff18..f6b7911d 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -1,16 +1,20 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController include AdminHelper + include OrbitControllerLib::DivisionForDisable + layout 'new_admin' before_filter :authenticate_user! - before_filter :get_categorys ,:only => [ :new,:edit,:update] + before_filter :only => [ :new,:edit,:update] do |controller| + controller.get_categorys('BulletinCategory') + end # before_filter :for_admin_only,:only => [:] # before_filter :for_app_manager,:only => [:index,:show,] before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins] def index # @bulletins = Bulletin.all # @bulletins = Bulletin.desc("postdate desc") - get_categorys(params[:bulletin_category_id]) + get_categorys('BulletinCategory',params[:bulletin_category_id]) get_tags @filter = params[:filter] @@ -35,11 +39,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - # @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10) - @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : get_viewable("bulletin") - @bulletin_categories = BulletinCategory.all - #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 + @bulletin_categories = get_categories_for_index("BulletinCategory") + @bulletin_category_ids = @bulletin_categories.collect{|t| t.id.to_s} + [nil] + + @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin",:bulletin_category_id.in => @bulletin_category_ids) : get_viewable("bulletin",:bulletin_category_id.in => @bulletin_category_ids) @bulletin_link = BulletinLink.new @link_url = panel_announcement_back_end_bulletins_path @@ -327,19 +331,28 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController end end - def get_categorys(id = nil) - @bulletin_categorys = [] - #@unit_list_for_anc = UnitListForAnc.all - if(is_manager? || is_admin?) - @bulletin_categorys = (id ? BulletinCategory.all.find(id).to_a : BulletinCategory.all) - elsif is_sub_manager? - @bulletin_categorys = BulletinCategory.all.authed_for_user(current_user,'submit') - end - if @bulletin_categorys.empty? && params[:action] != "index" - flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") - redirect_to :action => :index - end - end + # def get_categories_for_index(id = nil) + # @bulletin_categories = [] + # if(is_manager? || is_admin?) + # @bulletin_categories = (id ? BulletinCategory.admin_manager_all.find(id).to_a : BulletinCategory.admin_manager_all) + # elsif is_sub_manager? + # @bulletin_categories = BulletinCategory.all + # end + # @bulletin_categories + # end + + # def get_categorys(id = nil) + # @bulletin_categorys = [] + # if(is_manager? || is_admin?) + # @bulletin_categorys = (id ? BulletinCategory.admin_manager_all.find(id).to_a : BulletinCategory.admin_manager_all) + # elsif is_sub_manager? + # @bulletin_categorys = BulletinCategory.all.authed_for_user(current_user,'submit') + # end + # if @bulletin_categorys.empty? && params[:action] != "index" + # flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") + # redirect_to :action => :index + # end + # end def get_tags module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb index 1b54c799..1fb743f9 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb @@ -1,10 +1,10 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendController - + include OrbitControllerLib::DivisionForDisable before_filter :for_app_manager,:except => [:index] def index - @news_bulletin_categorys = get_disable_object_by_user(NewsBulletinCategory) + @news_bulletin_categorys = get_categories_for_index("NewsBulletinCategory") #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 @news_bulletin_category = NewsBulletinCategory.new(:display => 'List') @@ -110,7 +110,7 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendContro # DELETE /news_bulletins/1 # DELETE /news_bulletins/1.xml def destroy - @news_bulletin_category = NewsBulletinCategory.find(params[:id]).first + @news_bulletin_category = NewsBulletinCategory.find(params[:id]) @news_bulletin_category.disable = @news_bulletin_category.disable ? false : true if @news_bulletin_category.save! diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb index 7e28f717..87a475ef 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb @@ -1,16 +1,20 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController - + include OrbitControllerLib::DivisionForDisable before_filter :authenticate_user! # before_filter :for_admin_only,:only => [:] # before_filter :for_app_manager,:only => [:index,:show,] before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_news_bulletins] - before_filter :get_categorys ,:only => [ :new,:edit,:update] + before_filter :only => [ :new,:edit,:update] do |controller| + controller.get_categorys('NewsBulletinCategory') + controller.get_unit_list + end + def index # @news_bulletins = NewsBulletin.all # @news_bulletins = NewsBulletin.desc("postdate desc") - get_categorys(params[:news_bulletin_category_id]) + get_categorys("NewsBulletinCategory",params[:news_bulletin_category_id]) get_tags @filter = params[:filter] @@ -37,9 +41,12 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController # @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_news_bulletins : NewsBulletin.all.page(params[:page]).per(10) - @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("news_bulletin") : get_viewable("news_bulletin") - @news_bulletin_categories = NewsBulletinCategory.all - #TODO 需要做 manager ,admin 才可以 all. 其他 available就好 + + @news_bulletin_categories = get_categories_for_index("NewsBulletinCategory") + @news_bulletin_category_ids = @news_bulletin_categories.collect{|t| t.id.to_s} + [nil] + + + @news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("news_bulletin",:news_bulletin_category_id.in => @news_bulletin_category_ids) : get_viewable("news_bulletin",:news_bulletin_category_id.in => @news_bulletin_category_ids) @news_bulletin_link = NewsBulletinLink.new @link_url = panel_news_back_end_news_bulletins_path @@ -315,20 +322,32 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController protected - def get_categorys(id = nil) - @news_bulletin_categorys = [] - @unit_list_for_anc = UnitListForAnc.all - if(is_manager? || is_admin?) - @news_bulletin_categorys = (id ? NewsBulletinCategory.find(id).to_a : NewsBulletinCategory.all) - elsif is_sub_manager? - @news_bulletin_categorys = NewsBulletinCategory.all.authed_for_user(current_user,'submit') - end - if @news_bulletin_categorys.empty? && params[:action] != "index" - flash[:alert] = t("news.error.no_avilb_cate_for_posting") - redirect_to :action => :index - end - end + # def get_categories_for_index(id = nil) + # @news_bulletin_categories = [] + # if(is_manager? || is_admin?) + # @news_bulletin_categories = (id ? NewsBulletinCategory.admin_manager_all.find(id).to_a : NewsBulletinCategory.admin_manager_all) + # elsif is_sub_manager? + # @news_bulletin_categories = NewsBulletinCategory.all + # end + # @news_bulletin_categories + # end + # def get_categorys(id = nil) + # @news_bulletin_categorys = [] + # @unit_list_for_anc = UnitListForAnc.all + # if(is_manager? || is_admin?) + # @news_bulletin_categorys = (id ? NewsBulletinCategory.admin_manager_all.find(id).to_a : NewsBulletinCategory.admin_manager_all) + # elsif is_sub_manager? + # @news_bulletin_categorys = NewsBulletinCategory.all.authed_for_user(current_user,'submit') + # end + # if @news_bulletin_categorys.empty? && params[:action] != "index" + # flash[:alert] = t("news.error.no_avilb_cate_for_posting") + # redirect_to :action => :index + # end + # end + def get_unit_list + @unit_list_for_anc = UnitListForAnc.all + end def get_tags module_app = ModuleApp.first(:conditions => {:key => 'news'}) diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb index a7d270a5..8160fd89 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb @@ -1,8 +1,9 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendController before_filter :for_app_manager,:except => [:index] + include OrbitControllerLib::DivisionForDisable def index - @web_link_categorys = WebLinkCategory.all + @web_link_categorys = get_categories_for_index("WebLinkCategory") @web_link_category = WebLinkCategory.new(:display => 'List') @url = panel_web_resource_back_end_web_link_categorys_path @@ -86,12 +87,18 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendCont # DELETE /web_links/1.xml def destroy @web_link_category = WebLinkCategory.find(params[:id]) - @web_link_category.destroy + @web_link_category.disable = @web_link_category.disable ? false : true - respond_to do |format| - format.html { redirect_to(panel_web_resource_back_end_web_link_categorys_url) } - # format.xml { head :ok } - format.js + if @web_link_category.save! + respond_to do |format| + format.html { redirect_to(panel_web_resource_back_end_web_link_categorys_url) } + # format.xml { head :ok } + format.js + end + else + flash[:error] = t("web_link_category.update_failed") + format.html { render :action => "index" } 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 af557bcb..8189a05e 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 @@ -1,12 +1,12 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController + include OrbitControllerLib::DivisionForDisable before_filter :authenticate_user! # before_filter :for_app_manager,:except => [:index,:show] before_filter :for_app_sub_manager,:except => [:index] def index - get_categorys(params[:web_link_category_id]) - + get_categorys("WebLinkCategory",params[:web_link_category_id]) @filter = params[:filter] new_filter = params[:new_filter] @@ -23,11 +23,14 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController elsif new_filter @filter = {new_filter[:type] => [new_filter[:id].to_s]} end + @web_link_categories = get_categories_for_index("WebLinkCategory") + @web_link_category_ids = @web_link_categories.collect{|t| t.id.to_s} + [nil] # @web_links = WebLink.search(params[:category_id]) - @web_links = (params[:sort] || @filter) ? get_sorted_and_filtered_web_links : WebLink.all.page(params[:page]).per(10) - - get_tags + #@web_links = (params[:sort] || @filter) ? get_sorted_and_filtered_web_links : WebLink.all.page(params[:page]).per(10) + @web_links = (params[:sort] || @filter) ? get_sorted_and_filtered("web_link",:web_link_category_id.in => @web_link_category_ids) : get_viewable("web_link",:web_link_category_id.in => @web_link_category_ids) + + get_tags respond_to do |format| format.html # index.html.erb @@ -51,6 +54,7 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController # GET /web_links/new # GET /web_links/new.xml def new + @web_link = WebLink.new get_categorys @@ -131,17 +135,31 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController end protected - - def get_categorys(id = nil) - @web_link_categorys = (id ? WebLinkCategory.find(id).to_a : WebLinkCategory.excludes('disabled' => true)) + - @web_link_categorys = [] - if(is_manager? || is_admin?) - @web_link_categorys = (id ? WebLinkCategory.find(id).to_a : WebLinkCategory.excludes('disabled' => true)) - elsif is_sub_manager? - @web_link_categorys = WebLinkCategory.authed_for_user(current_user,'edit') - end - end + # def get_index_categories(id = nil) + # @bulletin_categorys = [] + # if(is_manager? || is_admin?) + # @bulletin_categorys = (id ? BulletinCategory.admin_manager_all.find(id).to_a : BulletinCategory.admin_manager_all) + # elsif is_sub_manager? + # @bulletin_categorys = BulletinCategory.all + # end + # @bulletin_categorys + # end + + + # def get_categorys(id = nil) + # @web_link_categorys = [] + # if(is_manager? || is_admin?) + # @web_link_categorys = (id ? WebLinkCategory.admin_manager_all.find(id).to_a : WebLinkCategory.admin_manager_all)) + # elsif is_sub_manager? + # @web_link_categorys = WebLinkCategory.all.authed_for_user(current_user,'edit') + # end + # if @web_link_categorys.empty? && params[:action] != "index" + # flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") + # redirect_to :action => :index + # end + # end def get_tags module_app = ModuleApp.first(:conditions => {:key => 'web_resource'}) diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb index f9f52e7d..8d018df4 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb @@ -7,7 +7,7 @@
          • <%= link_to t('web_resource.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %>
            • -
          • <%= link_to show_toggle_archive_btn(web_link_category), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
            • +
          • <%= link_to show_toggle_archive_btn(web_link_category), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true ,:class=> "archive_toggle"%>
          • <%= show_web_link_permission_link web_link_category %>
          diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/destroy.js.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/destroy.js.erb index bea99633..fc1ed142 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/destroy.js.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/destroy.js.erb @@ -1 +1 @@ -$("#<%= dom_id @web_link_category %>").remove(); \ No newline at end of file +$("#<%= dom_id @web_link_category %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@web_link_category) %> "); \ No newline at end of file From 9b86e8f24ee0c3c18cc56b106e78c7b87bd9291e Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 6 Jul 2012 18:24:25 +0800 Subject: [PATCH 31/32] fix mid site connection --- config/initializers/middle_site_connection.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/initializers/middle_site_connection.rb b/config/initializers/middle_site_connection.rb index 1b99224a..345ad464 100644 --- a/config/initializers/middle_site_connection.rb +++ b/config/initializers/middle_site_connection.rb @@ -6,10 +6,10 @@ $mid_site_connection module MiddleSiteConnection @mid_host = { - :host => '127.0.0.1', #mruling.nccu.edu.tw or 127.0.0.1 - :port => 8005, #3306 or 8005 - :username => "root", - :password => "a3G6yWd9", + :host => 'mruling.nccu.edu.tw', #mruling.nccu.edu.tw or 127.0.0.1 + :port => 3306, #3306 or 8005 + :username => "rulingcom", + :password => "5w3iJQ9OJQMGhJibKP6YQje8", :database => "RSS23_NCCU_MIDDLE", :encoding => "UTF8" } From 49862e70f931bdb6475e49df9f8507304b0d9263 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 9 Jul 2012 12:05:21 +0800 Subject: [PATCH 32/32] hide category at front end --- app/controllers/admin/module_apps_new_interface_controller.rb | 2 +- app/controllers/admin/object_auths_new_interface_controller.rb | 2 +- .../panel/announcement/back_end/approvals_controller.rb | 2 +- .../panel/announcement/front_end/bulletins_controller.rb | 2 +- .../panel/news/back_end/news_approvals_controller.rb | 2 +- .../panel/news/back_end/news_bulletins_controller.rb | 1 + .../panel/news/front_end/news_bulletins_controller.rb | 2 +- .../controllers/panel/news/widget/news_bulletins_controller.rb | 2 +- .../panel/web_resource/front_end/web_links_controller.rb | 2 +- .../panel/web_resource/widget/web_links_controller.rb | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/module_apps_new_interface_controller.rb b/app/controllers/admin/module_apps_new_interface_controller.rb index f8770ab3..863af560 100644 --- a/app/controllers/admin/module_apps_new_interface_controller.rb +++ b/app/controllers/admin/module_apps_new_interface_controller.rb @@ -56,7 +56,7 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController def get_categorys(id = nil) @bulletin_categorys = [] if(is_manager? || is_admin?) - @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) + @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.all) elsif is_sub_manager? @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') end diff --git a/app/controllers/admin/object_auths_new_interface_controller.rb b/app/controllers/admin/object_auths_new_interface_controller.rb index 42e82b47..31c5e900 100644 --- a/app/controllers/admin/object_auths_new_interface_controller.rb +++ b/app/controllers/admin/object_auths_new_interface_controller.rb @@ -49,7 +49,7 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController # def get_categorys(id = nil) # @bulletin_categorys = [] # if(is_manager? || is_admin?) - # @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) + # @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.all) # elsif is_sub_manager? # @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') # end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb index dc4f2de6..8944f9bb 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb @@ -54,7 +54,7 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle # def get_categorys(id = nil) # @bulletin_categorys = [] # if(is_manager? || is_admin?) - # @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) + # @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.all) # elsif is_sub_manager? # @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') # end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index 9fd97b9b..238cbb6c 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -43,7 +43,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController protected def get_categorys - @bulletin_categorys = BulletinCategory.excludes('disabled' => true) + @bulletin_categorys = BulletinCategory.all end end diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb index 7354d360..f3f6cc22 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb @@ -54,7 +54,7 @@ class Panel::News::BackEnd::NewsApprovalsController < OrbitBackendController def get_categorys(id = nil) @news_bulletin_categorys = [] if(is_manager? || is_admin?) - @news_bulletin_categorys = (id ? NewsBulletinCategory.find(id).to_a : NewsBulletinCategory.excludes('disabled' => true)) + @news_bulletin_categorys = (id ? NewsBulletinCategory.find(id).to_a : NewsBulletinCategory.all) elsif is_sub_manager? @news_bulletin_categorys = NewsBulletinCategory.authed_for_user(current_user,'submit_new') end diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb index 87a475ef..d77927e5 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb @@ -85,6 +85,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController # GET /news_bulletins/new # GET /news_bulletins/new.xml def new + @news_bulletin = NewsBulletin.new @link_url = panel_news_back_end_news_bulletins_path diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb index b4f5fc82..230c9a56 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb @@ -43,7 +43,7 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController protected def get_categorys - @news_bulletin_categorys = NewsBulletinCategory.excludes('disabled' => true) + @news_bulletin_categorys = NewsBulletinCategory.all end end diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb index dad3c781..4a5cdb74 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb @@ -62,7 +62,7 @@ class Panel::News::Widget::NewsBulletinsController < OrbitWidgetController protected def get_categorys - @news_bulletin_categorys = NewsBulletinCategory.excludes('disabled' => true) + @news_bulletin_categorys = NewsBulletinCategory.all end end diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb index e605c768..a254c971 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb @@ -26,7 +26,7 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController protected def get_categorys - @web_link_categorys = WebLinkCategory.excludes('disabled' => true) + @web_link_categorys = WebLinkCategory.all end end diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb index 42419db2..fcb0cb1b 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb @@ -47,7 +47,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController protected def get_categorys - @web_link_categorys = WebLinkCategory.excludes('disabled' => true) + @web_link_categorys = WebLinkCategory.all end def get_tags