the_role 2.0.3 → 2.0.4

data/app/controllers/admin/roles_controller.rb

@@ -30,7 +30,7 @@ class Admin::RolesController < ApplicationController
   end
 
   def update
-    if @role.update_role params[:role].try(:[],:the_role)
+    if @role.update_role params[:role][:the_role]
       flash[:notice] = t 'the_role.role_updated'
       redirect_to_edit
     else
@@ -47,7 +47,7 @@ class Admin::RolesController < ApplicationController
   protected
 
   def role_params
-    params.require(:role).permit(:name, :title, :description)
+    params.require(:role).permit(:name, :title, :description, :the_role)
   end
 
   def role_find

data/app/views/admin/roles/_role.html.haml

@@ -17,7 +17,7 @@
       %h3= section
       .delete
         .btn-group
-          = button_to t('.delete_section'), admin_role_section_path(role, section), :method => :delete, :class => 'btn btn-danger', :confirm => t('.section_delete_confirm')
+          = button_to t('.delete_section'), admin_role_section_path(role, section), method: :delete, class: 'btn btn-danger', data: { confirm: t('.section_delete_confirm') }
 
       - rules.each_pair do |rule, value|
         .rule
@@ -28,27 +28,27 @@
             .btn-group
               - klass = value ? :success : :info
               - state = value ? t('.enable') : t('.disable')
-              %button{ :class => "btn btn-#{klass}" }= state
-              %button{ :class => "btn btn-#{klass} dropdown-toggle", 'data-toggle' => :dropdown }
+              %button{ class: "btn btn-#{klass}" }= state
+              %button{ class: "btn btn-#{klass} dropdown-toggle", 'data-toggle' => :dropdown }
                 %span.caret
               %ul.dropdown-menu
                 %li.success= link_to t('.enable'),  rule_on_admin_role_section_path(role, section, :name => rule), :method => :put
                 %li.info=    link_to t('.disable'), rule_off_admin_role_section_path(role, section, :name => rule), :method => :put
                 %li.divider
-                %li.error= link_to t('.delete_rule'), destroy_rule_admin_role_section_path(role, section, :name => rule), :method => :delete, :confirm => t('.rule_delete_confirm')
+                %li.error= link_to t('.delete_rule'), destroy_rule_admin_role_section_path(role, section, :name => rule), method: :delete, data: { confirm: t(".rule_delete_confirm") }
 
   %h4= t '.create_section'
 
-  = form_tag admin_role_sections_path(role), :class => 'well form-inline' do |f|
-    = text_field_tag :section_name, '', :class => 'input-xlarge', :placeholder => t('.new_section_placeholder')
-    = submit_tag t('.create_section'), :class => :btn
+  = form_tag admin_role_sections_path(role), class: 'well form-inline' do |f|
+    = text_field_tag :section_name, '', class: 'input-xlarge', :placeholder => t('.new_section_placeholder')
+    = submit_tag t('.create_section'), class: :btn
 
   %h4= t '.create_rule'
 
-  = form_tag create_rule_admin_role_sections_path(role), :class => 'well form-inline' do |f|
+  = form_tag create_rule_admin_role_sections_path(role), class:  'well form-inline' do |f|
     %select.span3{ :name => :section_name }
       - role.to_hash.each_pair do |section, rules|
         %option{ :value => section }= section
 
-    = text_field_tag :rule_name, '', :class => 'input-large', :placeholder => t('.new_rule_placeholder')
-    = submit_tag t('.create_rule'), :class => :btn
+    = text_field_tag :rule_name, '', class:  'input-large', :placeholder => t('.new_rule_placeholder')
+    = submit_tag t('.create_rule'), class:  :btn

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &76998310 !ruby/object:Gem::Requirement
+  requirement: &77484780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76998310
+  version_requirements: *77484780
 description: Authorization for Rails 4 with Web Interface
 email:
 - zykin-ilya@ya.ru
@@ -44,7 +44,6 @@ files:
 - app/models/concerns/role_model.rb
 - app/models/concerns/the_role_base.rb
 - app/models/concerns/the_role_user_model.rb
-- app/views/admin/roles/_form.haml
 - app/views/admin/roles/_role.html.haml
 - app/views/admin/roles/_sidebar.html.haml
 - app/views/admin/roles/edit.html.haml

data/app/views/admin/roles/_form.haml

@@ -1,25 +0,0 @@
-- role = @role.to_hash
-
-- if role.blank?
-  %h3= t('.empty')
-- else
-  -role.each do |name, set|
-    %h4
-      = name
-      %span.controls
-        = link_to(t('.delete'), admin_role_section_path(@role, name), :method => :delete, :confirm => t('.destroy_section_confirm'))
-
-    - if set.is_a?(Hash)
-      %ul.rights
-        - set.each do |n, v|
-          %li
-            = check_box_tag "role[the_role][#{name}][#{n}]", true, v
-            = n
-            .controls
-              = link_to t('.delete'), destroy_rule_admin_role_section_path(@role, name, :name => n), :method => :delete, :confirm => t('.delete_rule_confirm')
-
-  = f.submit button
-
-
-
-