lyb_devise_admin 0.2.1 → 0.3.0

data/app/controllers/authorized_controller.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class AuthorizedController < InheritedResources::Base
   # Authorization
   authorize_resource

data/app/controllers/users_controller.rb

@@ -1,19 +1,11 @@
+# encoding: utf-8
+
 # Users Controller
 #
 # Provides a user/account management interface.
 class UsersController < AuthorizedController
   helper :devise
 
-  # Scopes
-  has_scope :tagged_with
-  
-#  def create
-#    @user = User.new(params[:user])
-#    @user.person = Person.create(:type => params[:user]['role_texts'].first.to_s.camelcase) if params[:user]['role_texts'].first
-#
-#    create!{ users_path }
-#  end
-  
   # Actions
   def update
     @user = resource
@@ -40,6 +32,14 @@ class UsersController < AuthorizedController
     redirect_to users_path, :notice => t('crud.flash.unlocked', :user => @user.to_s)
   end
 
+  def lock
+    @user = resource
+
+    @user.locke_access!
+
+    redirect_to users_path, :notice => t('crud.flash.locked', :user => @user.to_s)
+  end
+
   def current
     redirect_to current_user
   end

data/app/helpers/devise_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module DeviseHelper
   # Prepare roles to show in select inputs etc.
   def roles_for_collection

data/app/views/users/_form.html.haml

@@ -1,11 +1,8 @@
-= semantic_form_for @user do |f|
-  = f.semantic_errors
-  = f.inputs do
-    = f.input :email
-    = f.input :password, :hint => !f.object.new_record?, :input_html => {:autocomplete => "off"}
-    = f.input :password_confirmation
-    -# f.input :current_password, :required => true unless can?(:manage, User)
-    = f.input :role_texts, :as => :select, :collection => roles_for_collection, :include_blank => false, :input_html => {:multiple => 'multiple'}, :required => true if can?(:manage, Role)
+= simple_form_for @user do |f|
+  = f.input :email
+  = f.input :password, :hint => !f.object.new_record?, :input_html => {:autocomplete => "off"}
+  = f.input :password_confirmation
+  = f.input :current_password, :required => true unless can?(:manage, User)
+  = f.input :role_texts, :as => :select, :collection => Ability.roles_for_collection, :include_blank => false, :input_html => {:multiple => 'multiple'}, :required => true if can?(:manage, Role)
 
-  = f.buttons do
-    = f.commit_button
+  = f.button :submit

data/app/views/users/_list.html.haml

@@ -0,0 +1,12 @@
+%table.table
+  %thead
+    %tr
+      %th= t_attr :login
+      %th= t_attr :name
+      %th= t_attr :email
+      %th= t_attr :role_texts
+      %th= t_attr :last_sign_in_at if Devise.mappings[:user].trackable?
+      %th= t_attr :locked if Devise.mappings[:user].lockable?
+      %th.action-links
+  %tbody
+    = render @users

data/app/views/users/_user.html.haml

@@ -0,0 +1,13 @@
+%tr
+  %td= link_to user.login, user, 'data-href-container' => 'tr'
+  %td= user.to_s
+  %td= user.email
+  %td= user.roles.join(', ')
+  %td= user.last_sign_in_at if Devise.mappings[:user].trackable?
+  %td= user.locked_at if Devise.mappings[:user].lockable?
+
+  %td.action-links
+    =link_to t_action(:edit), edit_resource_url(user)
+    =link_to t_action(:lock), lock_user_path(user), :method => :post if Devise.mappings[:user].lockable? && !user.locked_at?
+    =link_to t_action(:unlock), unlock_user_path(user), :method => :post if Devise.mappings[:user].lockable? && user.locked_at?
+    =link_to t_action(:delete), resource_url(user), :confirm => t_confirm_delete(user), :method => :delete

data/config/locales/{lyb_devise_admin.yml → de.yml}

@@ -1,6 +1,7 @@
 de:
   activerecord:
     models:
+      user:                             Benutzer
     attributes:
       user:
         email:                          E-Mail
@@ -8,8 +9,14 @@ de:
         password_confirmation:          Passwort Bestätigung
         current_password:               Aktuelles Passwort  
         remember_me:                    Angemeldet bleiben  
+        last_sign_in_at:                Letzte Anmeldung
         created_at:                     Registriert seit
         roles:                          Rollen
         role_texts:                     Rollen
         locked:                         Gesperrt
         name:                           Name
+
+  crud:
+    flash:
+      locked:                           "Benutzer %{user} gesperrt."
+      unlocked:                         "Benutzer %{user} freigeschaltet."

data/config/routes.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Rails.application.routes.draw do
   resources :users do
     member do

data/lib/lyb_devise_admin/railtie.rb

@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 require 'lyb_devise_admin'
 require 'rails'
 
 module LybDeviseAdmin
   class Railtie < Rails::Engine
-    config.to_prepare do
-      ApplicationController.helper(DeviseHelper)
+    initializer 'lyb_devise_admin.helpers' do
+      ActionView::Base.send :include, DeviseHelper
     end
   end
 end

data/lib/lyb_devise_admin/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module LybDeviseAdmin
-  VERSION="0.2.1"
+  VERSION="0.3.0"
 end

data/lib/lyb_devise_admin.rb

@@ -1 +1,3 @@
+# encoding: utf-8
+
 require 'lyb_devise_admin/railtie' if defined?(::Rails::Railtie)

metadata

@@ -1,83 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lyb_devise_admin
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Simon H\xC3\xBCrlimann (CyT)"
+authors:
+- Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-12 00:00:00 +02:00
-default_executable: 
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies: []
-
-description: LybDeviseAdmin provides a ready-to-use admin interface for device.
-email: 
+description: LybDeviseAdmin provides a ready-to-use admin interface for devise.
+email:
 - simon.huerlimann@cyt.ch
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - app/controllers/authorized_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/devise_helper.rb
-- app/views/users/_collection_table.html.haml
 - app/views/users/_form.html.haml
-- app/views/users/_resource_detail.html.haml
-- app/views/users/edit.html.haml
-- app/views/users/index.html.haml
-- app/views/users/new.html.haml
-- app/views/users/show.html.haml
-- config/locales/lyb_devise_admin.yml
+- app/views/users/_list.html.haml
+- app/views/users/_user.html.haml
+- config/locales/de.yml
 - config/routes.rb
 - lib/lyb_devise_admin.rb
 - lib/lyb_devise_admin/railtie.rb
 - lib/lyb_devise_admin/version.rb
 - README.rdoc
-has_rdoc: true
 homepage: https://github.com/huerlisi/has_accounts
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Admin interface for device.
 test_files: []
-
+has_rdoc: 

data/app/views/users/_collection_table.html.haml

@@ -1,21 +0,0 @@
-= contextual_links
-
-%h2= t_title
-
-= paginated_section collection do
-  - @attributes = ['name', 'email', 'role_texts', 'created_at', 'locked']
-  %table.list{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
-    %thead
-      %tr
-        - @attributes.each do |field|
-          %th= t_attr field, collection.first.class
-        %th.action-links
-    %tbody
-      - collection.each do |r|
-        %tr
-          - @attributes.each do |field|
-            %td= r.send(field) if r.respond_to?(field)
-          %td.action-links
-            =link_to t_action(:show), resource_url(r), 'data-href-container' => 'tr'
-            =link_to t_action(:edit), edit_resource_url(r)
-            =link_to t_action(:delete), resource_url(r), :confirm => t_confirm_delete(r), :method => :delete

data/app/views/users/_resource_detail.html.haml

@@ -1,9 +0,0 @@
-%p= resource.to_s
-
-#user
-  %h2= t_attr(:roles)
-
-  %ul#roles
-  - resource.roles.each do |role|
-    %li
-      = role.to_s

data/app/views/users/edit.html.haml

@@ -1,5 +0,0 @@
-= contextual_links
-
-%h2= t_title
-
-= render 'form'

data/app/views/users/index.html.haml

@@ -1,21 +0,0 @@
-= contextual_links
-
-%h2= t_title
-
-= paginated_section collection do
-  - @attributes = ['name', 'email', 'role_texts', 'created_at', 'locked']
-  %table.list{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
-    %thead
-      %tr
-        - @attributes.each do |field|
-          %th= t_attr field, collection.first.class
-        %th.action-links
-    %tbody
-      - collection.each do |r|
-        %tr
-          - @attributes.each do |field|
-            %td= r.send(field) if r.respond_to?(field)
-          %td.action-links
-            =link_to t_action(:show), resource_url(r), 'data-href-container' => 'tr'
-            =link_to t_action(:edit), edit_resource_url(r)
-            =link_to t_action(:delete), resource_url(r), :confirm => t_confirm_delete(r), :method => :delete

data/app/views/users/new.html.haml

@@ -1,5 +0,0 @@
-= contextual_links
-
-%h2= t_title
-
-= render 'form'

data/app/views/users/show.html.haml

@@ -1,8 +0,0 @@
-= contextual_links
-
-%h2= resource.to_s
-
-#user
-  %ul#roles
-  - resource.roles.each do |role|
-    %li= role.to_s