From 9305c2045cd28f69330a31d207a0e61f8db8053b Mon Sep 17 00:00:00 2001
From: Matthew Kaito Juyuan Fu <matthewfu.tw@gmail.com>
Date: Thu, 16 Feb 2012 14:59:26 +0800
Subject: [PATCH] add "all_user" for app&object auth

---
 app/controllers/admin/app_auths_controller.rb            | 5 ++++-
 app/controllers/admin/object_auths_controller.rb         | 5 ++++-
 .../admin/components/_user_role_management.html.erb      | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/app_auths_controller.rb b/app/controllers/admin/app_auths_controller.rb
index 56d0ae23d..9e980e53d 100644
--- a/app/controllers/admin/app_auths_controller.rb
+++ b/app/controllers/admin/app_auths_controller.rb
@@ -21,7 +21,10 @@ class Admin::AppAuthsController < ApplicationController
 
   def create
     app_auth = AppAuth.find_or_create_by(module_app_id: params[:module_app_id])
-    params[:new].each do |item|
+    auth_all = params[:auth_all] || false
+    app_auth.update_attribute(:all,auth_all)
+    new_array = params[:new] || []
+    new_array.each do |item|
       field = item[0]
       field_value = item[1]
       if field_value!=''
diff --git a/app/controllers/admin/object_auths_controller.rb b/app/controllers/admin/object_auths_controller.rb
index 573409b65..a7a8dc419 100644
--- a/app/controllers/admin/object_auths_controller.rb
+++ b/app/controllers/admin/object_auths_controller.rb
@@ -33,7 +33,10 @@ class Admin::ObjectAuthsController < ApplicationController
 
   def create_role
     object_auth = ObjectAuth.find(params[:id])
-    params[:new].each do |item|
+    auth_all = params[:auth_all] || false
+    object_auth.update_attribute(:all,auth_all)
+    new_array = params[:new] || []
+    new_array.each do |item|
       field = item[0]
       field_value = item[1]
       if field_value!=''
diff --git a/app/views/admin/components/_user_role_management.html.erb b/app/views/admin/components/_user_role_management.html.erb
index ed7c34765..99cd72d71 100644
--- a/app/views/admin/components/_user_role_management.html.erb
+++ b/app/views/admin/components/_user_role_management.html.erb
@@ -1,7 +1,12 @@
+<div id="open_for_all_user">
+	<h1>All User</h1>
+	<%= form_tag(submit_url) do %>
+	<%= check_box_tag 'auth_all',true,auth.all  %><%= submit_tag 'Add Role' %><br/>
+	<% end %>
+</div>
+
 <div id="user_role_management">
 	<h1>User Role</h1>
-	All User
-
 	<%= form_tag(submit_url) do %>
 		<%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %>
 		<%= submit_tag 'Add Role' %><br/>