From f3000d194782dea1379d8777fa759f42804bc502 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 17 Nov 2014 18:20:10 +0800 Subject: [PATCH 01/26] added active and survey module templates --- .../modules/active/index.html.erb | 24 +++++++++++++++++++ .../modules/survey/index.html.erb | 20 ++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 app/templates/orbit_bootstrap/modules/active/index.html.erb create mode 100644 app/templates/orbit_bootstrap/modules/survey/index.html.erb diff --git a/app/templates/orbit_bootstrap/modules/active/index.html.erb b/app/templates/orbit_bootstrap/modules/active/index.html.erb new file mode 100644 index 0000000..5bda937 --- /dev/null +++ b/app/templates/orbit_bootstrap/modules/active/index.html.erb @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + +
+

{{page-title}}

+
{{th_category}}{{th_act_time_range}}{{th_title}}{{th_sign_up_time_range}}{{th_sign_up}}
{{category}}{{act_start_date}} ~
{{act_end_date}}		{{title}}{{sign_start_date}} ~
{{sign_end_date}}		{{sign_up}}
+{{pagination_goes_here}} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/survey/index.html.erb b/app/templates/orbit_bootstrap/modules/survey/index.html.erb new file mode 100644 index 0000000..577ef16 --- /dev/null +++ b/app/templates/orbit_bootstrap/modules/survey/index.html.erb @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + +

{{page-title}}

{{th_title}}{{th_time_range}}{{th_write}}{{th_result}}
{{title}}{{time_range}}{{write}}{{result}}
+{{pagination_goes_here}} \ No newline at end of file From a1df9c5af39829a4d8db8099f7e21c1edc54e6c6 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 18 Nov 2014 19:08:17 +0800 Subject: [PATCH 02/26] some changes for desktop --- app/models/module_app.rb | 3 +++ lib/orbit_app/module/registration.rb | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/models/module_app.rb b/app/models/module_app.rb index fcc475c..cd1d4a1 100644 --- a/app/models/module_app.rb +++ b/app/models/module_app.rb @@ -12,6 +12,7 @@ class ModuleApp field :authorizable_models, type: Array field :widget_enable, type: Boolean, default: false field :widget_methods + field :desktop_enabled, type: Boolean, default: false field :widget_settings has_many :categories, dependent: :destroy, :autosave => true @@ -19,6 +20,7 @@ class ModuleApp has_many :authorizations scope :frontend_enabled, ->{ where(:frontend_enable => true)} + scope :desktop_enabled, ->{ where(:desktop_enabled => true)} scope :widget_enabled, ->{ where(:widget_enable => true)} def refetch_setting!(reg) @@ -30,6 +32,7 @@ class ModuleApp self[:widget_enable] = reg.is_widget_enabled self[:widget_methods] = reg.get_widget_methods self[:widget_settings] = reg.get_widget_settings + self[:desktop_enabled] = reg.is_desktop_enabled end def sub_managers diff --git a/lib/orbit_app/module/registration.rb b/lib/orbit_app/module/registration.rb index dc99306..25f6f1b 100644 --- a/lib/orbit_app/module/registration.rb +++ b/lib/orbit_app/module/registration.rb @@ -40,7 +40,7 @@ module OrbitApp end class RegisteredModule - attr_reader :name,:key,:base_path, :module_label,:widget_methods,:authorizable_models,:is_authorizable, :data_count, :widget_settings, :icon_class_no_sidebar + attr_reader :name,:key,:base_path, :module_label,:widget_methods,:authorizable_models,:is_authorizable, :data_count, :widget_settings, :icon_class_no_sidebar,:desktop_enabled def initialize(name,&block) @name = name @@ -52,6 +52,7 @@ module OrbitApp @is_taggable = false @authorizable_models = [] @is_authorizable = false + @desktop_enabled = false @taggable_model = nil @is_categorizable = false @is_frontend_enabled = false @@ -130,6 +131,14 @@ module OrbitApp authorizable_on end + def desktop_enabled(status) + @desktop_enabled = status + end + + def is_desktop_enabled + @desktop_enabled + end + def is_authorizable @is_authorizable end From 97b4ad95e0f7f671be43acdbb4cde7db639d0fba Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 20 Nov 2014 17:06:15 +0800 Subject: [PATCH 03/26] fix for language while creating pages --- app/controllers/pages_controller.rb | 12 +++++++----- built_in_extensions.rb | 21 ++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index c741557..f7fe1d2 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -391,11 +391,12 @@ class PagesController < ApplicationController page = Page.find(params[:page][:parent_page]) page.url = page.url == "/" ? "" : page.url @url = page.url + "/#{params[:page][:page_id]}" - p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: [:en, :zh_tw],external_url_translations: [:en, :zh_tw]) + p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: current_site.valid_locales,external_url_translations: current_site.valid_locales) p["url"] = @url if p["external_url_translations"] - p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["en"].present? - p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["zh_tw"].present? + current_site.in_use_locales.each do |loc| + p["external_url_translations"][loc.to_s] = p["external_url_translations"][loc.to_s].sub("http://" + request.host_with_port,"") if p["external_url_translations"][loc.to_s].present? + end end p end @@ -409,8 +410,9 @@ class PagesController < ApplicationController p["enabled_for_sitemap"] = p["enabled_for_sitemap"] || [] p["enabled_for_mobile"] = p["enabled_for_mobile"] || 0 if p["external_url_translations"] - p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["en"].present? - p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["zh_tw"].present? + current_site.in_use_locales.each do |loc| + p["external_url_translations"][loc.to_s] = p["external_url_translations"][loc.to_s].sub("http://" + request.host_with_port,"") if p["external_url_translations"][loc.to_s].present? + end end p end diff --git a/built_in_extensions.rb b/built_in_extensions.rb index daeee7c..07691ac 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -1,12 +1,12 @@ -gem 'announcement', git: 'http://gitlab.tp.rulingcom.com/saurabh/announcement-test.git' -gem 'ad_banner', git: 'http://gitlab.tp.rulingcom.com/saurabh/adbanner-test.git' -gem "archive", git: 'http://gitlab.tp.rulingcom.com/saurabh/archive.git' -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 'announcement', path: '/Volumes/MyData/github/orbit4.5/new_modules/announcement' +gem 'ad_banner', path: '/Volumes/MyData/github/orbit4.5/new_modules/adbanner-test' +gem "archive", path: '/Volumes/MyData/github/orbit4.5/new_modules/archive' +gem 'gallery', path: '/Volumes/MyData/github/orbit4.5/new_modules/gallery' +gem 'links', path: '/Volumes/MyData/github/orbit4.5/new_modules/links' +gem 'page_content', path: '/Volumes/MyData/github/orbit4.5/new_modules/pagecontent' +gem 'faq', path: '/Volumes/MyData/github/orbit4.5/new_modules/faq' #Personal Plugins -gem 'personal_journal', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-journal.git' +gem 'personal_journal', path: '/Volumes/MyData/github/orbit4.5/personal_plugins/personal-journal' gem 'personal_conference', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-conference.git' gem 'personal_diploma', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-diploma.git' gem 'personal_experience', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-experience.git' @@ -20,8 +20,7 @@ gem 'personal_research', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-r #widgets gem "site_menu_widget", git: 'http://gitlab.tp.rulingcom.com/saurabh/site-menu-widget.git' gem "breadcrumb_widget", git: "http://gitlab.tp.rulingcom.com/saurabh/breadcrumb-widget.git" -gem "announcement_link_widget", git: "http://gitlab.tp.rulingcom.com/harry/announcement-link-widget.git" +gem "announcement_link_widget", path: "/Volumes/MyData/github/orbit4.5/new_widgets/announcement-link-widget" #desktop -gem "orbit_4_5_desktop", git: 'http://gitlab.tp.rulingcom.com/ray/orbit-4-5-desktop.git' - +gem "orbit_4_5_desktop", path: '/Volumes/MyData/github/orbit4.5/orbit-4-5-desktop' From 57681de065337d0792652bdda472853abb9f26cd Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 20 Nov 2014 17:13:25 +0800 Subject: [PATCH 04/26] added spens module to gem file --- built_in_extensions.rb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/built_in_extensions.rb b/built_in_extensions.rb index 07691ac..a8a1a86 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -1,12 +1,14 @@ -gem 'announcement', path: '/Volumes/MyData/github/orbit4.5/new_modules/announcement' -gem 'ad_banner', path: '/Volumes/MyData/github/orbit4.5/new_modules/adbanner-test' -gem "archive", path: '/Volumes/MyData/github/orbit4.5/new_modules/archive' -gem 'gallery', path: '/Volumes/MyData/github/orbit4.5/new_modules/gallery' -gem 'links', path: '/Volumes/MyData/github/orbit4.5/new_modules/links' -gem 'page_content', path: '/Volumes/MyData/github/orbit4.5/new_modules/pagecontent' -gem 'faq', path: '/Volumes/MyData/github/orbit4.5/new_modules/faq' +gem 'announcement', git: 'http://gitlab.tp.rulingcom.com/saurabh/announcement-test.git' +gem 'ad_banner', git: 'http://gitlab.tp.rulingcom.com/saurabh/adbanner-test.git' +gem "archive", git: 'http://gitlab.tp.rulingcom.com/saurabh/archive.git' +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 'survey', git: 'http://gitlab.tp.rulingcom.com/spen/survey.git' +gem 'active', git: 'http://gitlab.tp.rulingcom.com/spen/active.git' #Personal Plugins -gem 'personal_journal', path: '/Volumes/MyData/github/orbit4.5/personal_plugins/personal-journal' +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' gem 'personal_diploma', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-diploma.git' gem 'personal_experience', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-experience.git' @@ -20,7 +22,7 @@ gem 'personal_research', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-r #widgets gem "site_menu_widget", git: 'http://gitlab.tp.rulingcom.com/saurabh/site-menu-widget.git' gem "breadcrumb_widget", git: "http://gitlab.tp.rulingcom.com/saurabh/breadcrumb-widget.git" -gem "announcement_link_widget", path: "/Volumes/MyData/github/orbit4.5/new_widgets/announcement-link-widget" +gem "announcement_link_widget", git: "http://gitlab.tp.rulingcom.com/harry/announcement-link-widget.git" #desktop -gem "orbit_4_5_desktop", path: '/Volumes/MyData/github/orbit4.5/orbit-4-5-desktop' +gem "orbit_4_5_desktop", git: 'http://gitlab.tp.rulingcom.com/ray/orbit-4-5-desktop.git' From d58090816e85b795dec63913be3dc6c55d9d2e25 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 20 Nov 2014 17:36:37 +0800 Subject: [PATCH 05/26] fix for language --- app/controllers/pages_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index f7fe1d2..62aa813 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -402,7 +402,7 @@ class PagesController < ApplicationController end def page_update_params - p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [],menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: [:en, :zh_tw], external_url_translations: [:en, :zh_tw]) + p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [],menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: current_site.valid_locales, external_url_translations: current_site.valid_locales) p["role_status"] = p["role_status"] || [] p["categories"] = p["categories"] || [] p["enabled_for"] = p["enabled_for"] || [] From 212f612e3eb6fcbe64ebeec45205a88429b094be Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 21 Nov 2014 17:25:02 +0800 Subject: [PATCH 06/26] fixed uri parsing and also some page controller changes --- app/controllers/pages_controller.rb | 6 ++++-- app/helpers/application_helper.rb | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 62aa813..8fe3983 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -391,7 +391,8 @@ class PagesController < ApplicationController page = Page.find(params[:page][:parent_page]) page.url = page.url == "/" ? "" : page.url @url = page.url + "/#{params[:page][:page_id]}" - p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: current_site.valid_locales,external_url_translations: current_site.valid_locales) + valid_locales = current_site.valid_locales rescue [] + p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: valid_locales ,external_url_translations: valid_locales) p["url"] = @url if p["external_url_translations"] current_site.in_use_locales.each do |loc| @@ -402,7 +403,8 @@ class PagesController < ApplicationController end def page_update_params - p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [],menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: current_site.valid_locales, external_url_translations: current_site.valid_locales) + valid_locales = current_site.valid_locales rescue [] + p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [],menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: valid_locales, external_url_translations: valid_locales) p["role_status"] = p["role_status"] || [] p["categories"] = p["categories"] || [] p["enabled_for"] = p["enabled_for"] || [] diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 18708ea..40c98c8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -478,6 +478,7 @@ module ApplicationHelper end def get_target(link) + link = link.split("?").first temp_url = URI.parse(link) target = "_blank" if temp_url.host.nil? From fc90ab47a4c8e6409af6351a4b6bf6b3533a9346 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 24 Nov 2014 14:06:47 +0800 Subject: [PATCH 07/26] activity and survey removed by default --- built_in_extensions.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/built_in_extensions.rb b/built_in_extensions.rb index a8a1a86..86c097b 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -5,8 +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 'survey', git: 'http://gitlab.tp.rulingcom.com/spen/survey.git' -gem 'active', git: 'http://gitlab.tp.rulingcom.com/spen/active.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 a17a5aeb8b2441f15b81a4d88a352ac3381c2791 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Mon, 24 Nov 2014 16:44:32 +0800 Subject: [PATCH 08/26] test commit for access check --- .../modules/ad_banner/_ad_banner_widget1.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb index 2effac6..dfb81b7 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,6 +1,7 @@
Date: Mon, 24 Nov 2014 18:00:13 +0800 Subject: [PATCH 09/26] second check --- .../modules/ad_banner/_ad_banner_widget1.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb index dfb81b7..2effac6 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,7 +1,6 @@
Date: Mon, 24 Nov 2014 18:21:00 +0800 Subject: [PATCH 10/26] now only registered websites can update via update manager --- app/controllers/admin/sites_controller.rb | 33 +++++++++--------- app/controllers/admin/store_controller.rb | 2 +- app/controllers/orbit_admin_controller.rb | 1 - app/helpers/orbit_backend_helper.rb | 33 ++++++++++++++++++ app/models/orbit_store.rb | 3 ++ app/views/admin/sites/update_manager.erb | 41 +++++++++++++++++++++++ 6 files changed, 96 insertions(+), 17 deletions(-) create mode 100644 app/models/orbit_store.rb diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index f418a82..a926b6d 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -55,9 +55,6 @@ class Admin::SitesController < OrbitAdminController def preference end - def update_manager - end - def update_orbit end @@ -80,6 +77,7 @@ class Admin::SitesController < OrbitAdminController end def update_manager + @store_permissions = check_store_permissions end def get_update_history @@ -94,21 +92,26 @@ class Admin::SitesController < OrbitAdminController end def update_orbit - result = "" - need_stash = %x(git diff).blank? - %x(git stash) unless need_stash - %x(git fetch origin) - pull_result = %x(git pull -r --ff-only 2>&1 origin #{@branch}) - %x(git stash pop) unless need_stash + store_permissions = check_store_permissions + if store_permissions["permission_granted"] + result = "" + need_stash = %x(git diff).blank? + %x(git stash) unless need_stash + %x(git fetch origin) + pull_result = %x(git pull -r --ff-only 2>&1 origin #{@branch}) + %x(git stash pop) unless need_stash - if pull_result.include? "fatal: Not possible to fast-forward, aborting." - result = "failed" + if pull_result.include? "fatal: Not possible to fast-forward, aborting." + result = "failed" + else + result = "success" + Bundler.with_clean_env { `cd #{Rails.root} && bundle install` } + end + + render :text => result else - result = "success" - Bundler.with_clean_env { `cd #{Rails.root} && bundle install` } + render :json => store_permissions.to_json end - - render :text => result end def restart_server diff --git a/app/controllers/admin/store_controller.rb b/app/controllers/admin/store_controller.rb index c98c930..7370309 100644 --- a/app/controllers/admin/store_controller.rb +++ b/app/controllers/admin/store_controller.rb @@ -63,7 +63,7 @@ class Admin::StoreController < OrbitAdminController private def store_url - @store_url = "http://store.tp.rulingcom.com" + @store_url = OrbitStore::URL # @store_url = "http://localhost:3000" end end \ No newline at end of file diff --git a/app/controllers/orbit_admin_controller.rb b/app/controllers/orbit_admin_controller.rb index d084ef3..5e9aaac 100644 --- a/app/controllers/orbit_admin_controller.rb +++ b/app/controllers/orbit_admin_controller.rb @@ -81,5 +81,4 @@ class OrbitAdminController < ApplicationController @current_user_is_sub_manager = current_user.is_sub_manager?(@module_app) rescue false end - end diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index e0f1901..7af6d98 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -1,3 +1,5 @@ +require "uri" +require "net/http" module OrbitBackendHelper def self.included(base) @@ -152,6 +154,37 @@ module OrbitBackendHelper @user_has_privileges end + def check_store_permissions #checks with the store if it has proper access and rights to access store + store_permission = {} + store_token = current_site.store_token rescue nil + if !store_token.nil? + params_to_send = {'store_token' => current_site.store_token} + uri = URI.parse(OrbitStore::URL) + http = Net::HTTP.new(uri.host,uri.port) + request = Net::HTTP::Get.new("/site/permissions") + request.body = params_to_send.to_query + response = http.request(request) + data = JSON.parse(response.body) + if !data["success"] + case data["error"] + when "INVALID_SITE_TOKEN" + current_site.store_token = nil + current_site.save + end + store_permission["permission_granted"] = false + store_permission["error"] = data["error"] + store_permission["message"] = data["message"] + else + store_permission["permission_granted"] = true + end + else + store_permission["permission_granted"] = false + store_permission["error"] = "SITE_NOT_REGISTERED" + store_permission["message"] = "Site not registered." + end + store_permission + end + def render_401 render "public/401" end diff --git a/app/models/orbit_store.rb b/app/models/orbit_store.rb new file mode 100644 index 0000000..9c9b64f --- /dev/null +++ b/app/models/orbit_store.rb @@ -0,0 +1,3 @@ +class OrbitStore + URL = "http://store.tp.rulingcom.com" +end \ No newline at end of file diff --git a/app/views/admin/sites/update_manager.erb b/app/views/admin/sites/update_manager.erb index 28434e8..cd8fcbb 100644 --- a/app/views/admin/sites/update_manager.erb +++ b/app/views/admin/sites/update_manager.erb @@ -94,6 +94,25 @@ <%= t("update_manager_.available_updates") %> + <% if !@store_permissions["permission_granted"] %> + + + <% if @store_permissions["message"].size > 30 %> + "><%= @store_permissions["message"][0..17] + "..." %> + + <% else %> + <%= @store_permissions["message"] %> + <% end %> + + <% end %>
@@ -104,7 +123,11 @@
+ <% if @store_permissions["permission_granted"] %> + <% else %> + Please register here. + <% end %>
@@ -113,6 +136,24 @@ <%= t("update_manager_.update_status") %> + <% if !@store_permissions["permission_granted"] %> + + <% if @store_permissions["message"].size > 30 %> + "><%= @store_permissions["message"][0..17] + "..." %> + + <% else %> + <%= @store_permissions["message"] %> + <% end %> + + <% end %>
From 03822379b2f7b96a3479cb64be82103c4176876f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 27 Nov 2014 18:09:18 +0800 Subject: [PATCH 11/26] small fix for page render --- app/controllers/pages_controller.rb | 4 +++- app/helpers/application_helper.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 8fe3983..66b0104 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -317,7 +317,9 @@ class PagesController < ApplicationController @part_partials.each do |key, partial| html_string = "" partial.each do |p| - html_string = html_string + p + if !p.nil? + html_string = html_string + p + end end pp = doc.css("*[#{key}]") if !pp.blank? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 40c98c8..44b622b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -22,7 +22,7 @@ module ApplicationHelper header = Nokogiri::HTML(header_file_html, nil, "UTF-8") sub_menu_html = site.sub_menu html = header.to_s - html = html.gsub("{{site_name}}",site.title) + html = html.gsub("{{site_name}}",(site.title rescue "")) html = html.gsub("%7B%7Blogo_url%7D%7D",(site.site_logo.url.nil? ? "/assets/site-logo.png" : site.site_logo.url)) if site.sitemap_menu_in_header sub_menu_html = sub_menu_html + "Sitemap" From 179a14d717de2bf1a5d45143ac3052035c28bb61 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 27 Nov 2014 18:19:43 +0800 Subject: [PATCH 12/26] fixed url target issue --- app/helpers/application_helper.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 44b622b..59d5f9b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -478,11 +478,13 @@ module ApplicationHelper end def get_target(link) - link = link.split("?").first - temp_url = URI.parse(link) - target = "_blank" - if temp_url.host.nil? - target = "_self" + if link.nil? + link = link.split("?").first + temp_url = URI.parse(link) + target = "_blank" + if temp_url.host.nil? + target = "_self" + end end target end From eeebed8d7b9137da10d9c0d2c78ab1b2a7ea343d Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 27 Nov 2014 18:28:37 +0800 Subject: [PATCH 13/26] small fix --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 59d5f9b..ddd8f83 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -478,10 +478,10 @@ module ApplicationHelper end def get_target(link) + target = "_blank" if link.nil? link = link.split("?").first temp_url = URI.parse(link) - target = "_blank" if temp_url.host.nil? target = "_self" end From ff17799e83a63cea5b5b3dcba30048c2d05dd71e Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 1 Dec 2014 14:48:39 +0800 Subject: [PATCH 14/26] small fix --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ddd8f83..8d38e8b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -479,7 +479,7 @@ module ApplicationHelper def get_target(link) target = "_blank" - if link.nil? + if !link.nil? link = link.split("?").first temp_url = URI.parse(link) if temp_url.host.nil? From 5e789bd473584f83ab1e55cfa367c0be0f8e5edf Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 1 Dec 2014 15:06:26 +0800 Subject: [PATCH 15/26] fix for multi language --- app/helpers/application_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8d38e8b..0d37af4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -144,9 +144,9 @@ module ApplicationHelper def create_menu(items,level) html = "" items.each do |key,item| - li = @menus_items[level].gsub("href_here",item["url"]) - li = li.gsub("{{link_name}}",key) - li = li.gsub("target_here",item["target"]) + li = @menus_items[level].gsub("href_here",(item["url"] || "")) + li = li.gsub("{{link_name}}",(key || "")) + li = li.gsub("target_here",(item["target"] || "")) li = request.original_fullpath == item['url'] ? li.gsub("{{active}}","active") : li.gsub("{{active}}","") if item["children"] && !item["children"].empty? From ed36c3a48f3a37cd8f7268da67efb9715d769872 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 1 Dec 2014 18:07:23 +0800 Subject: [PATCH 16/26] added category to page model --- app/models/page.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/page.rb b/app/models/page.rb index ca43d9a..539b2a7 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -2,6 +2,7 @@ class Page include Mongoid::Document include Mongoid::Timestamps include OrbitModel::Impression + include OrbitCategory::Categorizable field :name, localize: true field :number, type: Integer From 4b1380000700c79df88bc01aa2d8794d0a1264e9 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 1 Dec 2014 19:11:40 +0800 Subject: [PATCH 17/26] some update for page settings --- app/controllers/pages_controller.rb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 66b0104..fc39620 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -163,12 +163,16 @@ class PagesController < ApplicationController } end else - categories = module_app.categories.collect do |cat| - { - "title" => cat.title, - "id" => cat.id.to_s - } - end + if !module_app.key.eql?("page_content") + categories = module_app.categories.collect do |cat| + { + "title" => cat.title, + "id" => cat.id.to_s + } + end + else + categories = [] + end end roles = roles.nil? ? [] : roles @@ -200,6 +204,9 @@ class PagesController < ApplicationController @modules = ModuleApp.all.frontend_enabled @module_app = ModuleApp.find_by_key(@page.module) rescue nil @categories = @module_app.categories rescue [] + if @module_app.key.eql?("page_content") + @categories = [] + end @tags = @module_app.tags rescue [] if @module_app.key.eql?("member") @roles = Role.order_by(:_id=>'ASC').all.collect do |role| From 0526b5f9e79b1415cdc835b0e007436285892c8e Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 1 Dec 2014 19:32:09 +0800 Subject: [PATCH 18/26] update manager fix --- app/controllers/admin/sites_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index a926b6d..539a3f6 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -105,7 +105,8 @@ class Admin::SitesController < OrbitAdminController result = "failed" else result = "success" - Bundler.with_clean_env { `cd #{Rails.root} && bundle install` } + p1 = fork { bundle_install } + Process.detach(p1) end render :text => result @@ -114,6 +115,13 @@ class Admin::SitesController < OrbitAdminController end end + def bundle_install + Bundler.with_clean_env { `cd #{Rails.root} && bundle install` } + %x(kill -s USR2 `cat tmp/pids/unicorn.pid`) + sleep 5 + render :nothing => true + end + def restart_server %x(kill -s USR2 `cat tmp/pids/unicorn.pid`) sleep 5 From a33022cb4fddac3a46e0b361a59ea4e7002b2844 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 1 Dec 2014 19:35:12 +0800 Subject: [PATCH 19/26] test for update manager --- app/views/admin/sites/update_manager.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/admin/sites/update_manager.erb b/app/views/admin/sites/update_manager.erb index cd8fcbb..ac42d64 100644 --- a/app/views/admin/sites/update_manager.erb +++ b/app/views/admin/sites/update_manager.erb @@ -1,3 +1,4 @@ +