From 2ae34f1cbc75ca52b365c6e50ba4fc4f62758936 Mon Sep 17 00:00:00 2001 From: JiangRu Date: Thu, 18 Dec 2014 16:08:34 +0800 Subject: [PATCH 1/5] fix journal all author --- app/controllers/admin/import_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb index e427eca..563e3a9 100644 --- a/app/controllers/admin/import_controller.rb +++ b/app/controllers/admin/import_controller.rb @@ -1040,7 +1040,11 @@ class Admin::ImportController < OrbitAdminController :paper_title_translations => { "en" => rss2_journal["paper_title"]["en"], - "zh_tw" => rss2_journal["paper_title"]["zh-tw"]} + "zh_tw" => rss2_journal["paper_title"]["zh-tw"]}, + + :authors_translations => { + "en" => rss2_journal["author"], + "zh_tw" => rss2_journal["author"]} } journal = JournalPaper.where(:rss2_id => rss2_journal["rss_id"]).first From f9f4224a5ba2f42d2dd63680f85fc0ea1f8a5b02 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 19 Dec 2014 16:36:44 +0800 Subject: [PATCH 2/5] calendar removed from built in --- built_in_extensions.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/built_in_extensions.rb b/built_in_extensions.rb index 98a8522..86c097b 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -5,7 +5,6 @@ gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git' gem 'links', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git' gem 'page_content', git: 'http://gitlab.tp.rulingcom.com/saurabh/pagecontent.git' gem 'faq', git: 'http://gitlab.tp.rulingcom.com/saurabh/faq.git' -gem 'calendar', git: 'http://gitlab.tp.rulingcom.com/harry/calendar.git' #Personal Plugins gem 'personal_journal', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-journal.git' gem 'personal_conference', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-conference.git' From 6de00652fe3006d8c4067ea4283f9b827ffe6108 Mon Sep 17 00:00:00 2001 From: JiangRu Date: Mon, 22 Dec 2014 11:46:27 +0800 Subject: [PATCH 3/5] fix member plugin intro or complete list --- app/controllers/members_controller.rb | 45 ++++++++++++++++++--------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 13cb49d..0393ef0 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -139,29 +139,44 @@ class MembersController < ApplicationController plugins = OrbitApp::Plugin::Registration.all rescue nil plugin_list = plugins.collect.with_index do |plugin, idx| intro = PersonalPluginIntro.find_by(member_profile_id: member.id, _type: "#{plugin.app_name}Intro") rescue nil - if intro.nil? or intro.complete_list - plugin_data = plugin.app_name.constantize.where(member_profile_id: member) rescue nil - pd = plugin_data.collect do |p| - slug_title = ["JournalPaper","WritingConference"].include?(plugin.app_name) ? p.create_link : p.slug_title - { - "data_title" => slug_title, - "link_to_show" => OrbitHelper.url_to_plugin_show(p.to_param,plugin.module_app_name.underscore) - } + if !intro.blank? + if !intro.complete_list.blank? + plugin_data = plugin.app_name.constantize.where(member_profile_id: member) rescue nil + pd = plugin_data.collect do |p| + slug_title = ["JournalPaper","WritingConference"].include?(plugin.app_name) ? p.create_link : p.slug_title + { + "data_title" => slug_title, + "link_to_show" => OrbitHelper.url_to_plugin_show(p.to_param,plugin.module_app_name.underscore) + } + end end - elsif intro.brief_intro == true - pd = [] - pd << {"data_title" => intro.text.html_safe} - end - { + if !intro.brief_intro.blank? + pdi = [] + pdi << {"data_intro_title" => intro.text.html_safe} + end + + if intro.complete_list.blank? + complete_display = "hide" + end + + if intro.brief_intro.blank? + brief_display = "hide" + end + end + + { "plugin_data" => pd, + "plugin_data_intro" => pdi, + "complete_display" => complete_display, + "brief_display" => brief_display, "plugin_name" => plugin.module_app_name.underscore, "plugin_title" => t('module_name.'+plugin.module_app_name.underscore), "plugin_class" => idx==0 ? "active" : "" - } + } end - plugin_list = plugin_list.reject{|plugin| plugin['plugin_data'].blank?} + plugin_list = plugin_list.reject{|plugin| plugin['plugin_data'].blank? and plugin['plugin_data_intro'].blank?} { "plugins" => plugin_list, "profile_data" => profile_data, From 0c62c4b994eea5e65bd0957055096d810ab547db Mon Sep 17 00:00:00 2001 From: manson Date: Fri, 6 Feb 2015 17:36:37 +0800 Subject: [PATCH 4/5] fix development mode not using precompiled aseets --- config/environments/development.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/environments/development.rb b/config/environments/development.rb index ae34a24..2ddb972 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -24,6 +24,7 @@ Orbit::Application.configure do # This option may cause significant delays in view rendering with a large # number of complex assets. config.assets.debug = true + config.assets.digest = true config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 } config.action_mailer.default_url_options = { host: "localhost:3000", protocol: "http" } From 1aa5739380d6ec277b3a2bb111946546b6247728 Mon Sep 17 00:00:00 2001 From: manson Date: Fri, 6 Feb 2015 18:05:05 +0800 Subject: [PATCH 5/5] add all JS and CSS to precompile --- config/environments/production.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 214bbef..23a78fc 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -60,7 +60,8 @@ Orbit::Application.configure do # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # config.assets.precompile += %w( search.js ) - config.assets.precompile += %w( ckeditor/* ) + # config.assets.precompile += %w( ckeditor/* ) + config.assets.precompile += %w( *.js *.css *.js.* *.css.* ckeditor/* ) # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors.