1.Remove category column when category is specified
2.Showing category if not in category browsing 3.Redirect to home and show error if app page is not available for user language 4.Showing no context to display if object has no language for it. 5.Browse new and announcement by unit is now applicable.
This commit is contained in:
1 parent
80887ace3c
commit
cbf7ccc13b
21 files changed
+126
-56
No files matched your search
@@ -180,7 +180,7 @@ module ParserCommon
|
||||
if (content["main"] == "true" && !page.module_app.nil?)
|
||||
ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}"
|
||||
ret << "/#{params[:id]}" if params[:id] && !params[:id].eql?(page.id.to_s)
|
||||
ret << "?inner=true&page_id=#{page.id}&category_id=#{category}&tag_id=#{tag}&preview=#{params[:preview]}&page_main=#{params[:page_main]}&search_query=#{params[:search_query]}"
|
||||
ret << "?inner=true&page_id=#{page.id}&category_id=#{category}&tag_id=#{tag}&preview=#{params[:preview]}&page_main=#{params[:page_main]}&search_query=#{params[:search_query]}&name=#{params[:name]}"
|
||||
ret << "'></div>"
|
||||
else
|
||||
part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
|
||||
|
||||
@@ -83,4 +83,17 @@ namespace :data_migration do
|
||||
puts("#{'='*10}Finished#{'='*10}")
|
||||
end
|
||||
|
||||
task :make_bulletin_save_dept_data => :environment do
|
||||
Bulletin.all.each{|bt| bt.save!}
|
||||
end
|
||||
|
||||
task :extend_exsisted_app_module_for_dept_search => :environment do
|
||||
app = ModuleApp.first({:conditions=>{:title => 'news'}})
|
||||
app.app_pages << "index_by_unit" if !app.widgets.include?("index_by_unit")
|
||||
app.save!
|
||||
app = ModuleApp.first({:conditions=>{:title => 'Announcement'}})
|
||||
app.app_pages << "index_by_unit" if !app.widgets.include?("index_by_unit")
|
||||
app.save!
|
||||
end
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user