From e21bbac441e811298dc6441d769efeb648356950 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 14 Sep 2015 20:04:56 +0800
Subject: [PATCH] url fix for announcements...

---
 app/controllers/{admin => }/bulletins_controller.rb | 2 +-
 config/routes.rb                                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename app/controllers/{admin => }/bulletins_controller.rb (98%)

diff --git a/app/controllers/admin/bulletins_controller.rb b/app/controllers/bulletins_controller.rb
similarity index 98%
rename from app/controllers/admin/bulletins_controller.rb
rename to app/controllers/bulletins_controller.rb
index 5b53d6b..2c2d357 100644
--- a/app/controllers/admin/bulletins_controller.rb
+++ b/app/controllers/bulletins_controller.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-class Admin::BulletinsController < ApplicationController
+class BulletinsController < ApplicationController
   before_filter :set_I18n
 
   def get_bulletins
diff --git a/config/routes.rb b/config/routes.rb
index bd2fddb..07c8638 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,7 +10,6 @@ Rails.application.routes.draw do
       delete 'announcement/deletefeed', to: 'announcements#deletefeed'
       get 'announcement/destroy_preview/:slug_title-:uid', to: 'announcements#destroy_preview'
       get 'announcement/approve_bulletin', to: 'announcements#approve_bulletin'
-      get 'announcement.json', to: 'bulletins#get_bulletins'
       get 'announcement/feed', to: 'announcements#feed'
       get 'announcements/feedform', to: 'announcements#feedform'
       resources :announcements
@@ -25,6 +24,8 @@ Rails.application.routes.draw do
    get "/xhr/announcements/feed/:uid" => "announcement_feeds#feed"
    get "/xhr/announcements/rssfeed/:uid" => "announcement_feeds#rssfeed"
    get "/xhr/announcements/feeds" => "announcement_feeds#feeds"
+   get '/xhr/announcements/announcement.json', to: 'bulletins#get_bulletins'
+
   end
   
 end