Separate announcement and news

app/controllers/admin/page_parts_controller.rb

@@ -27,8 +27,10 @@ class Admin::PagePartsController < ApplicationController
     @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
     @tag_objects = @r_tag.classify.constantize.all rescue nil
       case @module_app.key
-        when 'bulletin'
+        when 'announcement'
           @categories =  BulletinCategory.all
+        when 'news'
+          @categories =  NewsBulletinCategory.all
         when 'web_resource'
           @categories =  WebLinkCategory.all
       end
@@ -67,6 +69,8 @@ class Admin::PagePartsController < ApplicationController
     case @module_app.key
       when 'announcement'
         @categories =  BulletinCategory.all
+      when 'news'
+        @categories =  NewsBulletinCategory.all
       when 'web_resource'
         @categories =  WebLinkCategory.all
     end

app/controllers/admin/pages_controller.rb

@@ -31,7 +31,18 @@ class Admin::PagesController < ApplicationController
     @designs = Design.all.entries
     @design = @item.design ? @item.design : @designs.first
     @app_frontend_urls = @item.module_app.app_pages if @item.module_app
-    @categories =  BulletinCategory.all if @item.module_app && @item.module_app.key.eql?('announcement')
+    if @item.module_app
+      case @item.module_app.key
+        when 'announcement'
+          @categories =  BulletinCategory.all
+        when 'news'
+          @categories =  NewsBulletinCategory.all
+        when 'web_resource'
+          @categories =  WebLinkCategory.all
+      end
+    else
+      @categories = nil
+    end
   end
 
   def create

app/controllers/pages_controller.rb

@@ -33,9 +33,9 @@ class PagesController < ApplicationController
    
    def index_from_link
       if params[:page]
-        redirect_to "/#{@item.full_name}?page=#{params[:page]}"
+        redirect_to "/#{@item.full_name}?page=#{params[:page]}&category_id=#{params[:category_id]}&tag_id=#{params[:tag_id]}"
       else
-        redirect_to "/#{@item.full_name}"
+        redirect_to "/#{@item.full_name}?category_id=#{params[:category_id]}&tag_id=#{params[:tag_id]}"
       end
    end
    
@@ -51,11 +51,11 @@ class PagesController < ApplicationController
    
    def get_item
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
-      if params[:category_id]
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category => params[:category_id]})  
-      else 
+      # if params[:category_id]
+      #   @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category => params[:category_id]})  
+      # else 
         @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action]})
-      end
+      # end
    end
   
 end