Merge branch 'clean_development' into lukas/picked_ques

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -35,7 +35,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       end
       @frontend_style = @item.frontend_style
     end
-
     @item = Page.find(params[:page_id]) rescue nil
     if  !params[:search_query].blank?
       # search_cond =  {:is_checked=>true,:is_hidden=>false,:is_pending => false}

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb

@@ -31,6 +31,5 @@
 	<% end %>
 
 	</table>
-
-<%= paginate @bulletins, :param_name => :page_main, :params => {:inner => 'false'} %>
+<%= paginate( @bulletins, :param_name => :page_main, :params => {:inner => 'false'} ) rescue nil%>
 

vendor/built_in_modules/announcement/init.rb

@@ -25,6 +25,8 @@ module Announcement
     category ["BulletinCategory"]
     data_count 3..10
 
+    taggable
+
     widgets do
       default_widget do
         query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'

vendor/built_in_modules/archive/init.rb

@@ -19,6 +19,8 @@ module Archive
 
     category ["ArchiveFileCategory"]
 
+    taggable
+
     widgets do
       # default_widget do
       #   query 'ArchiveFile.all'

vendor/built_in_modules/faq/init.rb

@@ -19,6 +19,8 @@ module Faq
     category ["QaCategory"]
     data_count 1..20
 
+    taggable
+
     widgets do
       default_widget do
         query 'Qa.all'

vendor/built_in_modules/web_resource/init.rb

@@ -16,6 +16,8 @@ module WebResource
       end
     end
 
+    taggable
+
     widgets do
       # default_widget do
       #   query 'Bulletin.all'