chaltron 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: de230dc89777b90b7e81ef42da838180a72bd0ba
4
- data.tar.gz: 8743eb92b1f9d903d4a7e5b40659f41647bea35e
3
+ metadata.gz: 0696a63691d1bbfd419bafbcb7d6fd855883877e
4
+ data.tar.gz: f9d1face556bc53d83e95940e1d47d096dfc811d
5
5
  SHA512:
6
- metadata.gz: 8d6f5040e582d1db6cae0ff8d4687ffb8975897a35b5f2cfacd39c118d5ab486a655479cda93ea24d86126537683ea058428a223e64eaef9d04c6986aaf14117
7
- data.tar.gz: 4d6af95dddf706c9d68d3d148900bab57d4fb7b872bc2a5e56fc0c4cf91e5a0e44be8491ef38d46208464f8532be93e6ba631152a3f466369b2fed3508bf6c08
6
+ metadata.gz: ba7b28a73299bc22002520f091fa20b8a3976842349a33eb81f18e1c31cf96b92fab1f4480f266c0af45ffd0da78853b53c9f9cf49cb5c3377f1a73806803b62
7
+ data.tar.gz: 100ad752395e47abdaa43c13506e62d268cb3e5eac5ad16e8be221d2f19214426ed45e81d8019010ac2ea171a87a0ec8cd48838a55df8eb8c3c29adb4bb9dd8c
@@ -59,7 +59,7 @@ class DataTableBuilder
59
59
 
60
60
  container.DataTable(settings)
61
61
 
62
- $(document).on 'page:change', ->
62
+ $(document).on 'turbolinks:load', ->
63
63
  table = new DataTableBuilder
64
64
  table.go()
65
65
 
@@ -1,6 +1,6 @@
1
1
  class Chaltron::SessionsController < Devise::SessionsController
2
- after_filter :after_login, only: :create
3
- before_filter :before_logout, only: :destroy
2
+ after_action :after_login, only: :create
3
+ before_action :before_logout, only: :destroy
4
4
 
5
5
  default_log_category :login
6
6
 
@@ -6,8 +6,7 @@ class Chaltron::UsersController < ApplicationController
6
6
  default_log_category :user_admin
7
7
 
8
8
  def index
9
- @filters = params[:filters] || {}
10
-
9
+ @filters = filter_params
11
10
  # apply provider filter
12
11
  @users = @users.where(provider: nil) if @filters[:provider] == 'local'
13
12
  @users = @users.where(provider: :ldap) if @filters[:provider] == 'ldap'
@@ -45,7 +44,7 @@ class Chaltron::UsersController < ApplicationController
45
44
  end
46
45
 
47
46
  def self_update
48
- user_params_with_pass = self_update_params.dup
47
+ user_params_with_pass = self_update_params.dup.to_h
49
48
  if params[:user][:password].present?
50
49
  user_params_with_pass.merge!(
51
50
  password: params[:user][:password],
@@ -85,4 +84,7 @@ class Chaltron::UsersController < ApplicationController
85
84
  params.require(:user).permit(:email, :fullname)
86
85
  end
87
86
 
87
+ def filter_params
88
+ params.fetch(:filters, {}).permit(:provider, :activity)
89
+ end
88
90
  end
@@ -1,18 +1,18 @@
1
1
  <% if ldap_enabled? %>
2
2
  <div class='list-group'>
3
- <%= link_to users_url(filters: filters.merge(provider: nil)),
3
+ <%= link_to users_url(filters: filters.merge(provider: nil).to_h),
4
4
  class: (filters[:provider].blank? ? 'list-group-item active': 'list-group-item') do %>
5
5
  <span class='badge pull-right'><%= User.count %></span>
6
6
  <%= t '.provider.all' %>
7
7
  <% end %>
8
8
 
9
- <%= link_to users_url(filters: filters.merge(provider: 'local')),
9
+ <%= link_to users_url(filters: filters.merge(provider: 'local').to_h),
10
10
  class: (filters[:provider] == 'local' ? 'list-group-item active': 'list-group-item') do %>
11
11
  <span class='badge pull-right'><%= User.where(provider: nil).count %></span>
12
12
  <%= t '.provider.local' %>
13
13
  <% end %>
14
14
 
15
- <%= link_to users_url(filters: filters.merge(provider: 'ldap')),
15
+ <%= link_to users_url(filters: filters.merge(provider: 'ldap').to_h),
16
16
  class: (filters[:provider] == 'ldap' ? 'list-group-item active': 'list-group-item') do %>
17
17
  <span class='badge pull-right'><%= User.where(provider: :ldap).count %></span>
18
18
  <%= t '.provider.ldap' %>
@@ -22,7 +22,7 @@
22
22
  <% end %>
23
23
 
24
24
  <div class='list-group'>
25
- <%= link_to users_url(filters: filters.merge(activity: 'no_login')),
25
+ <%= link_to users_url(filters: filters.merge(activity: 'no_login').to_h),
26
26
  class: (filters[:activity] == 'no_login' ? 'list-group-item active': 'list-group-item') do %>
27
27
  <span class='badge pull-right'><%= User.where(sign_in_count: 0).count %></span>
28
28
  <%= t '.activity.no_login' %>
@@ -1,4 +1,4 @@
1
- <%= form_tag(user_omniauth_callback_path(:ldap), class: 'form-horizontal', role: 'form') do %>
1
+ <%= form_tag(user_ldap_omniauth_callback_path, class: 'form-horizontal', role: 'form') do %>
2
2
  <div class='form-group'>
3
3
  <%= label_tag 'username', 'Username', class: 'col-sm-3 control-label' %>
4
4
  <div class='col-sm-9'>
@@ -142,7 +142,7 @@ Devise.setup do |config|
142
142
  # Email regex used to validate email formats. It simply asserts that
143
143
  # one (and only one) @ exists in the given string. This is mainly
144
144
  # to give user feedback and not to assert the e-mail validity.
145
- # config.email_regexp = /\A[^@]+@[^@]+\z/
145
+ config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
146
146
 
147
147
  # ==> Configuration for :timeoutable
148
148
  # The time you want to timeout the user session without activity. After this
@@ -50,7 +50,9 @@ module Chaltron
50
50
  #
51
51
  protected
52
52
  def configure_permitted_parameters
53
- devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:login, :username, :email, :password, :remember_me) }
53
+ devise_parameter_sanitizer.permit(:sign_in) do |user|
54
+ user.permit(:login, :username, :email, :password, :remember_me)
55
+ end
54
56
  end
55
57
 
56
58
  end
@@ -1,3 +1,3 @@
1
1
  module Chaltron
2
- VERSION = '0.1.4'
2
+ VERSION = '0.1.5'
3
3
  end
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chaltron
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - vicvega
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-31 00:00:00.000000000 Z
11
+ date: 2016-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.2.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.2.0
27
27
  - !ruby/object:Gem::Dependency
@@ -346,6 +346,20 @@ dependencies:
346
346
  - - ">="
347
347
  - !ruby/object:Gem::Version
348
348
  version: '0'
349
+ - !ruby/object:Gem::Dependency
350
+ name: rails-controller-testing
351
+ requirement: !ruby/object:Gem::Requirement
352
+ requirements:
353
+ - - ">="
354
+ - !ruby/object:Gem::Version
355
+ version: '0'
356
+ type: :development
357
+ prerelease: false
358
+ version_requirements: !ruby/object:Gem::Requirement
359
+ requirements:
360
+ - - ">="
361
+ - !ruby/object:Gem::Version
362
+ version: '0'
349
363
  description: A ready-to-go application with authentication, authorization, logging...
350
364
  with bootstrap flavor
351
365
  email:
@@ -482,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
482
496
  version: '0'
483
497
  requirements: []
484
498
  rubyforge_project:
485
- rubygems_version: 2.6.2
499
+ rubygems_version: 2.5.1
486
500
  signing_key:
487
501
  specification_version: 4
488
502
  summary: Move faster and break things - revisited for rails 4