Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev

config/environments/development.rb

@@ -10,7 +10,7 @@ PrototypeR4::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local       = false
   #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 

config/initializers/carrierwave.rb

@@ -1,5 +1,3 @@
-#require 'carrierwave/orm/mongoid'
-
 begin
   db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))
 rescue
@@ -12,4 +10,6 @@ CarrierWave.configure do |config|
   config.grid_fs_port = db_config[Rails.env]['port']
   config.storage = :grid_fs
   config.grid_fs_access_url = "/gridfs"
-end
+end
+
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/

config/locales/en.yml

@@ -5,6 +5,8 @@ en:
   
   _locale: English
   
+  me: Me
+  
   add: Add
   back: Back
   create: Create

config/locales/zh_tw.yml

@@ -2,6 +2,8 @@ zh_tw:
   
   _locale: 中文
   
+  me: 我
+  
   add: 新增
   back: 回去
   create: 創造

config/routes.rb

@@ -11,7 +11,7 @@ PrototypeR4::Application.routes.draw do
   # routes for admin
   namespace :admin do
     resources :assets
-    resources :app_auths
+    resources :app_auths 
 
     resources :designs do
       collection do
@@ -38,7 +38,18 @@ PrototypeR4::Application.routes.draw do
       end
     end
     resources :module_apps do
+      resources :app_auths do
+        member do
+          match 'remove/:type/:target_id' ,:action=> 'remove',:via => "delete",:as =>:remove
+        end
+      end
+      
       member do
+        match 'assign_manager' ,:action=> 'assign_manager',:via => "post",:as =>:assign_manager
+        match 'assign_sub_manager' ,:action=> 'assign_sub_manager',:via => "post",:as =>:assign_sub_manager
+
+        match 'remove_manager/:app_manager_id' ,:action=> 'remove_manager',:via => "delete",:as =>:remove_manager
+        match 'remove_sub_manager/:app_sub_manager_id' ,:action=> 'remove_sub_manager',:via => "delete",:as =>:remove_sub_manager
         get 'reload_frontend_pages'
       end
     end