diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index f418a82..38da321 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,33 @@ 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 update` } + end + + render :text => result else - result = "success" - Bundler.with_clean_env { `cd #{Rails.root} && bundle install` } + render :json => store_permissions.to_json end + end - render :text => result + def bundle_install + Bundler.with_clean_env { `cd #{Rails.root} && bundle update` } + %x(kill -s USR2 `cat tmp/pids/unicorn.pid`) + sleep 5 + render :nothing => true 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/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index c741557..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| @@ -317,7 +324,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? @@ -391,17 +400,20 @@ 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]) + 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"] - 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 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]) + 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"] || [] @@ -409,8 +421,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/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 18708ea..0d37af4 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" @@ -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? @@ -478,10 +478,13 @@ module ApplicationHelper end def get_target(link) - temp_url = URI.parse(link) - target = "_blank" - if temp_url.host.nil? - target = "_self" + target = "_blank" + if !link.nil? + link = link.split("?").first + temp_url = URI.parse(link) + if temp_url.host.nil? + target = "_self" + end end target 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/helpers/orbit_helper.rb b/app/helpers/orbit_helper.rb index cbb01e0..2b87dfc 100644 --- a/app/helpers/orbit_helper.rb +++ b/app/helpers/orbit_helper.rb @@ -146,12 +146,7 @@ module OrbitHelper def self.user_can_edit?(obj) return false if @current_user.nil? return true if @current_user.is_admin? - - if obj.class.to_s == "PageContext" - return @current_user.is_manager?(@module_app) - else - return @current_user.nil? ? false : user_has_cateogry?(obj.category_id) - end + return @current_user.nil? ? false : self.user_has_cateogry?(obj.category_id) end def self.user_access_level? @@ -173,7 +168,9 @@ module OrbitHelper if @current_user.is_admin? or @current_user.is_manager?(@module_app) return true else - return @current_user.approved_categories.include?cat rescue false + category = Category.find(cat) rescue nil + return false if category.nil? + return @current_user.approved_categories.include?category rescue false end end 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/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/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 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 diff --git a/app/views/admin/sites/update_manager.erb b/app/views/admin/sites/update_manager.erb index 28434e8..ac42d64 100644 --- a/app/views/admin/sites/update_manager.erb +++ b/app/views/admin/sites/update_manager.erb @@ -1,3 +1,4 @@ +