saurabh/orbit-basic
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

questionnaire stuff

Browse Source 
Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
This commit is contained in:
Lukas authored and iCross committed 2013-06-06 18:29:58 +08:00
1 parent 32c259ac9e
commit adc15951bb
34 files changed
+818 -1819
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/routes.rb
+2 -2
View File
@@ -288,11 +288,11 @@ Orbit::Application.routes.draw do
match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
!request.query_string.include?("inner=true")
!request.query_string.include?("inner=true") && !request.query_string.include?("standalone=true")
}
match '/panel/:app_name/front_end/:app_action' => 'pages#index_from_link', :constraints => lambda { |request|
!request.query_string.include?("inner=true")
!request.query_string.include?("inner=true") && !request.query_string.include?("standalone=true")
}
match '/share/:model/:id' => 'application#render_share'