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

Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust 

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/config/locales/en.yml
	vendor/built_in_modules/announcement/config/locales/zh_tw.yml
This commit is contained in:
Christophe Vilayphiou 2012-05-04 15:59:26 +08:00
parent 8f1ce78ab4 b89975b4c4
commit 3bd3820519
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/parsers/parser_front_end.rb
View File

@ -46,6 +46,7 @@ module ParserFrontEnd
# ret << "&category_id=#{page.category}" if page[:category] # ret << "&category_id=#{page.category}" if page[:category]
ret << "&category_id=#{params[:category_id]}" if !params[:category_id].blank? ret << "&category_id=#{params[:category_id]}" if !params[:category_id].blank?
ret << "&tag_id=#{params[:tag_id]}" if !params[:tag_id].blank? ret << "&tag_id=#{params[:tag_id]}" if !params[:tag_id].blank?
ret << "&preview=true" if preview
ret << "'></div>" ret << "'></div>"
else else
part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil