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'