diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index e2cb266..74bcb79 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -156,6 +156,16 @@ module OrbitBackendHelper def need_access_right render_401 if !has_access? end + + def get_referer_url + referer_path = Rails.application.routes.recognize_path(request.referer) + if referer_path[:controller]!="pages" or (referer_path[:controller]==params[:controller] and referer_path[:action]!="index") + referer_url = '/'+params[:controller] + else + referer_url = request.referer + end + referer_url + end end diff --git a/app/templates/orbit_bootstrap/modules/announcement/index.html.erb b/app/templates/orbit_bootstrap/modules/announcement/index.html.erb index e374d1d..72a1e9f 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/index.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/index.html.erb @@ -1,6 +1,6 @@

- {{widget-title}} + {{page-title}}

diff --git a/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb index e374d1d..72a1e9f 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/index1.html.erb @@ -1,6 +1,6 @@

- {{widget-title}} + {{page-title}}