From 528f7d28b91accb757233cf795b8836ea1105168 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Tue, 12 Nov 2013 12:20:36 +0800 Subject: [PATCH] theaterurk fix --- config/mongoid.yml | 4 ++-- .../gallery/app/assets/javascripts/galleryAPI_frontend.js.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/mongoid.yml b/config/mongoid.yml index af2215215..d20c47270 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -8,7 +8,7 @@ defaults: &defaults development: <<: *defaults - database: test_site + database: orbit_site_new @@ -24,4 +24,4 @@ production: # password: <%= ENV['MONGOID_PASSWORD'] %> # database: <%= ENV['MONGOID_DATABASE'] %> <<: *defaults - database: orbit_test_new + database: orbit_site_new diff --git a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb index 7f2c7e337..35d584e33 100644 --- a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb +++ b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb @@ -176,7 +176,7 @@ var galleryAPI = function(){ if(rcom.getInternetExplorerVersion() == -1){ if(pageurl!=window.location){ - pageurl = window.location.pathname.replace("/","")+"?id="+pageurl+"&controller_action=theater"; + pageurl = window.location.pathname+"?id="+pageurl+"&controller_action=theater"; window.history.pushState({path:pageurl},'',pageurl); } }else{