From 804caaa09186d65acececfc4fd538790070d5cab Mon Sep 17 00:00:00 2001
From: Saurabh Bhatia <saurabh.a.bhatia@gmail.com>
Date: Fri, 2 May 2014 12:09:44 +0800
Subject: [PATCH] added authorizable to announcement, announcements controller
 with setup variables

---
 .../admin/announcements_controller.rb         | 23 +++++++++++--------
 app/views/admin/announcements/index.html.erb  |  2 +-
 lib/announcement/engine.rb                    |  2 ++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
index 1d59105..15d75c9 100644
--- a/app/controllers/admin/announcements_controller.rb
+++ b/app/controllers/admin/announcements_controller.rb
@@ -1,6 +1,13 @@
 # encoding: utf-8
 class Admin::AnnouncementsController < OrbitAdminController
-  before_filter :setup_vars
+  before_action ->(module_app = @app_title) { set_variables module_app }
+  before_action :set_bulletin, only: [:edit, :destroy]
+
+  def initialize
+    super
+    @app_title = "announcement"
+  end
+
 
   def index
     @tags = @module_app.tags
@@ -40,6 +47,7 @@ class Admin::AnnouncementsController < OrbitAdminController
     @sort
   end
 
+
   def new
     @tags =@module_app.tags
     @categories = @module_app.categories
@@ -59,7 +67,6 @@ class Admin::AnnouncementsController < OrbitAdminController
     @tags =@module_app.tags
     @categories = @module_app.categories
     @statuses = []
-    @bulletin = Bulletin.find(params[:id])
   end
 
   def update
@@ -72,8 +79,7 @@ class Admin::AnnouncementsController < OrbitAdminController
   end
 
   def destroy
-    bulletin = Bulletin.find(params[:id])
-    bulletin.destroy
+    @bulletin.destroy
     redirect_to "/admin/announcements"
   end
 
@@ -86,12 +92,11 @@ class Admin::AnnouncementsController < OrbitAdminController
 
   private
 
+  def set_bulletin
+    @bulletin = Bulletin.find(params[:id])
+  end
+
   def bulletin_params
     params.require(:bulletin).permit!
   end
-
-  def setup_vars
-    @module_app = ModuleApp.where(:key=>"announcement").first
-  end
-
 end
diff --git a/app/views/admin/announcements/index.html.erb b/app/views/admin/announcements/index.html.erb
index 46f211a..a17147a 100644
--- a/app/views/admin/announcements/index.html.erb
+++ b/app/views/admin/announcements/index.html.erb
@@ -92,4 +92,4 @@
   end
 %>
 
-<%= render 'layouts/delete_modal', delete_options: @delete_options %>
\ No newline at end of file
+<%= render 'layouts/delete_modal', delete_options: @delete_options %>
diff --git a/lib/announcement/engine.rb b/lib/announcement/engine.rb
index 4e6ebd1..7b424b6 100644
--- a/lib/announcement/engine.rb
+++ b/lib/announcement/engine.rb
@@ -7,9 +7,11 @@ module Announcement
         widget_methods ["widget"]
         taggable "Bulletin"
         categorizable
+        authorizable
 
         side_bar do
           head_label_i18n 'announcement.announcement', icon_class: "icons-megaphone"
+          available_for [:admin,:manager,:sub_manager]
           active_for_controllers ({:private=>['announcements']})
           head_link_path "admin_announcements_path"