chaltron 0.3.2 → 1.0.0
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 +5 -5
- data/README.md +2 -1
- data/app/assets/javascripts/chaltron.js +7 -5
- data/app/assets/javascripts/chaltron/datatables.js.coffee +2 -2
- data/app/assets/javascripts/chaltron/navbar.js.coffee +46 -0
- data/app/assets/javascripts/dataTables/dataTables.bootstrap4.min.js +8 -0
- data/app/assets/stylesheets/chaltron.scss +9 -9
- data/app/assets/stylesheets/chaltron/layout.scss +3 -29
- data/app/assets/stylesheets/chaltron/logs.scss +5 -0
- data/app/controllers/chaltron/ldap_controller.rb +5 -5
- data/app/controllers/chaltron/omniauth_callbacks_controller.rb +0 -1
- data/app/controllers/chaltron/sessions_controller.rb +0 -3
- data/app/controllers/chaltron/users_controller.rb +1 -3
- data/app/datatables/log_datatable.rb +3 -2
- data/app/helpers/chaltron/ldap_helper.rb +3 -3
- data/app/helpers/chaltron/logs_helper.rb +4 -13
- data/app/helpers/chaltron/users_helper.rb +20 -2
- data/app/helpers/chaltron_helper.rb +0 -16
- data/app/models/authorizable.rb +1 -1
- data/app/models/log.rb +10 -12
- data/app/models/user.rb +1 -5
- data/app/views/chaltron/ldap/multi_create.html.erb +39 -35
- data/app/views/chaltron/ldap/multi_new.html.erb +36 -30
- data/app/views/chaltron/ldap/search.html.erb +13 -10
- data/app/views/chaltron/logs/index.html.erb +22 -28
- data/app/views/chaltron/logs/show.html.erb +6 -6
- data/app/views/chaltron/users/_form.html.erb +8 -5
- data/app/views/chaltron/users/_side_filters.html.erb +10 -26
- data/app/views/chaltron/users/edit.html.erb +1 -1
- data/app/views/chaltron/users/index.html.erb +29 -31
- data/app/views/chaltron/users/new.html.erb +1 -1
- data/app/views/chaltron/users/self_edit.html.erb +27 -20
- data/app/views/chaltron/users/self_show.html.erb +8 -8
- data/app/views/chaltron/users/show.html.erb +10 -10
- data/app/views/devise/passwords/edit.html.erb +8 -7
- data/app/views/devise/passwords/new.html.erb +10 -7
- data/app/views/devise/sessions/_new_ldap.html.erb +17 -14
- data/app/views/devise/sessions/_new_local.html.erb +10 -7
- data/app/views/devise/sessions/new.html.erb +30 -25
- data/app/views/locales/en.yml +4 -4
- data/app/views/locales/it.yml +2 -2
- data/config/chaltron_navigation.rb +15 -23
- data/config/locales/en.yml +1 -6
- data/config/locales/it.yml +1 -6
- data/config/routes.rb +4 -5
- data/lib/chaltron.rb +1 -24
- data/lib/chaltron/bootstrap_form.rb +1 -1
- data/lib/chaltron/engine.rb +2 -3
- data/lib/chaltron/ldap/connection.rb +34 -93
- data/lib/chaltron/ldap/person.rb +3 -13
- data/lib/chaltron/ldap/user.rb +1 -5
- data/lib/chaltron/version.rb +1 -1
- data/lib/generators/chaltron/install_generator.rb +9 -3
- data/lib/generators/chaltron/templates/app/assets/stylesheets/home.scss +2 -20
- data/lib/generators/chaltron/templates/app/views/home/_carousel.html.erb +18 -18
- data/lib/generators/chaltron/templates/app/views/home/_faq.html.erb +10 -8
- data/lib/generators/chaltron/templates/app/views/home/_panel.html.erb +5 -7
- data/lib/generators/chaltron/templates/app/views/home/index.html.erb +12 -10
- data/lib/generators/chaltron/templates/app/views/home/test.html.erb +3 -5
- data/lib/generators/chaltron/templates/app/views/layouts/_footer.html.erb +7 -9
- data/lib/generators/chaltron/templates/app/views/layouts/_navbar.html.erb +8 -15
- data/lib/generators/chaltron/templates/config/initializers/chaltron.rb +4 -57
- data/lib/generators/chaltron/templates/config/navigation.rb +11 -10
- data/lib/templates/erb/scaffold/_form.html.erb +8 -5
- data/lib/templates/erb/scaffold/edit.html.erb +8 -8
- data/lib/templates/erb/scaffold/index.html.erb +15 -21
- data/lib/templates/erb/scaffold/new.html.erb +2 -6
- data/lib/templates/erb/scaffold/show.html.erb +9 -9
- metadata +24 -25
- data/app/assets/javascripts/dataTables/extras/dataTables.select.min.js +0 -23
- data/app/assets/stylesheets/dataTables/dataTables.bootstrap.css +0 -167
- data/app/assets/stylesheets/dataTables/extras/select.dataTables.css +0 -100
- data/app/models/application_record.rb +0 -3
- data/app/views/chaltron/logs/_log.html.erb +0 -14
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
<div class='container-fluid'>
|
|
2
|
-
<h3 class='
|
|
2
|
+
<h3 class='pt-4'><%= t '.title' %></h3>
|
|
3
3
|
<div class='row'>
|
|
4
4
|
|
|
5
5
|
<div class='col-md-9'>
|
|
6
|
-
<div class='
|
|
7
|
-
<div class='
|
|
8
|
-
<ul class='list-group'>
|
|
6
|
+
<div class='card'>
|
|
7
|
+
<div class='card-header'><%= t '.headers.details' %></div>
|
|
8
|
+
<ul class='list-group list-group-flush'>
|
|
9
9
|
<li class='list-group-item'>
|
|
10
10
|
<span><%= User.human_attribute_name(:username) %>: </span>
|
|
11
11
|
<strong><%= current_user.username %></strong>
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
<div class='col-md-3'>
|
|
32
|
-
<div class='
|
|
33
|
-
<div class='
|
|
34
|
-
<ul class='list-group'>
|
|
32
|
+
<div class='card'>
|
|
33
|
+
<div class='card-header'><%= t '.headers.activity' %></div>
|
|
34
|
+
<ul class='list-group list-group-flush'>
|
|
35
35
|
<% unless current_user.last_sign_in_at.nil? %>
|
|
36
36
|
<li class='list-group-item'>
|
|
37
37
|
<span><%= User.human_attribute_name(:last_sign_in_at) %>: </span>
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
</ul>
|
|
48
48
|
</div>
|
|
49
49
|
|
|
50
|
-
<%= link_to self_edit_users_path, class: 'btn btn-primary' do %>
|
|
50
|
+
<%= link_to self_edit_users_path, class: 'btn btn-primary mt-4' do %>
|
|
51
51
|
<%= icon 'edit', t('.edit') %>
|
|
52
52
|
<% end %>
|
|
53
53
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
<div class='container-fluid'>
|
|
2
|
-
<h3 class='
|
|
2
|
+
<h3 class='pt-4'><%= @user.display_name %></h3>
|
|
3
3
|
<div class='row'>
|
|
4
4
|
|
|
5
5
|
<div class='col-md-9'>
|
|
6
|
-
<div class='
|
|
7
|
-
<div class='
|
|
8
|
-
<ul class='list-group'>
|
|
6
|
+
<div class='card'>
|
|
7
|
+
<div class='card-header'><%= t '.headers.details' %></div>
|
|
8
|
+
<ul class='list-group list-group-flush'>
|
|
9
9
|
<li class='list-group-item'>
|
|
10
10
|
<span><%= User.human_attribute_name(:username) %>: </span>
|
|
11
11
|
<strong><%= @user.username %></strong>
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
</div>
|
|
34
34
|
|
|
35
35
|
<div class='col-md-3'>
|
|
36
|
-
<div class='
|
|
37
|
-
<div class='
|
|
38
|
-
<ul class='list-group'>
|
|
36
|
+
<div class='card'>
|
|
37
|
+
<div class='card-header'><%= t '.headers.activity' %></div>
|
|
38
|
+
<ul class='list-group list-group-flush'>
|
|
39
39
|
<li class='list-group-item'>
|
|
40
40
|
<span><%= User.human_attribute_name(:sign_in_count) %>: </span>
|
|
41
41
|
<strong><%= @user.sign_in_count %></strong>
|
|
@@ -64,13 +64,13 @@
|
|
|
64
64
|
<% end %>
|
|
65
65
|
|
|
66
66
|
<div class='pull-right'>
|
|
67
|
-
<%= link_to edit_user_path(@user), class: 'btn btn-
|
|
67
|
+
<%= link_to edit_user_path(@user), class: 'btn btn-primary' do %>
|
|
68
68
|
<%= icon :edit, t('.edit') %>
|
|
69
|
-
<% end
|
|
69
|
+
<% end %>
|
|
70
70
|
<%= link_to @user, method: :delete, class: 'btn btn-danger',
|
|
71
71
|
disabled: current_user == @user,
|
|
72
72
|
data: { confirm: t('.destroy_confirm', user: @user.username) } do %>
|
|
73
73
|
<%= icon :trash, t('.destroy') %>
|
|
74
|
-
<% end
|
|
74
|
+
<% end %>
|
|
75
75
|
</div>
|
|
76
76
|
</div>
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
<div class='container login-box'>
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
<div class='
|
|
2
|
+
<h4><%= t '.title' %></h4>
|
|
3
|
+
<div class='card'>
|
|
4
|
+
<div class='card-body'>
|
|
5
5
|
<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name),
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
layout: :horizontal, label_col: 'col-sm-4', control_col: 'col-sm-8',
|
|
7
|
+
html: { method: :put }) do |f| %>
|
|
8
8
|
<%= f.hidden_field :reset_password_token %>
|
|
9
9
|
<%= f.password_field :password, autofocus: true %>
|
|
10
10
|
<%= f.password_field :password_confirmation %>
|
|
11
|
-
<div class='form-group'>
|
|
12
|
-
<div class='col-sm-
|
|
11
|
+
<div class='form-group row'>
|
|
12
|
+
<div class='col-sm-4'></div>
|
|
13
|
+
<div class='col-sm-8'>
|
|
13
14
|
<%= f.submit t('.submit_text'), class: 'btn btn-primary' %>
|
|
14
15
|
</div>
|
|
15
16
|
</div>
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
<div class='container login-box'>
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
<div class='
|
|
2
|
+
<h4><%= t '.title' %></h4>
|
|
3
|
+
<div class='card'>
|
|
4
|
+
<div class='card-body'>
|
|
5
5
|
<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name),
|
|
6
|
-
layout: :horizontal, label_col:
|
|
7
|
-
html: { role: 'form', method: :post}
|
|
6
|
+
layout: :horizontal, label_col: 'col-sm-2', control_col: 'col-sm-10',
|
|
7
|
+
html: { role: 'form', method: :post } ) do |f| %>
|
|
8
8
|
<p><%= t '.par1' %></p>
|
|
9
9
|
<%= f.email_field :email, autofocus: true %>
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
|
|
11
|
+
<div class='form-group row'>
|
|
12
|
+
<div class='col-sm-2'></div>
|
|
13
|
+
<div class='col-sm-10'>
|
|
12
14
|
<%= f.submit t('.submit_text'), class: 'btn btn-primary' %>
|
|
13
15
|
</div>
|
|
14
16
|
</div>
|
|
17
|
+
|
|
15
18
|
<hr>
|
|
16
19
|
<p><%= t '.par2_html' %></p>
|
|
17
20
|
<% end %>
|
|
@@ -1,30 +1,33 @@
|
|
|
1
|
-
<%= form_tag(user_ldap_omniauth_callback_path,
|
|
2
|
-
<div class='form-group'>
|
|
3
|
-
<%= label_tag 'username', 'Username', class: 'col-sm-3
|
|
1
|
+
<%= form_tag(user_ldap_omniauth_callback_path, role: 'form') do %>
|
|
2
|
+
<div class='form-group row'>
|
|
3
|
+
<%= label_tag 'username', 'Username', class: 'col-sm-3 col-form-label' %>
|
|
4
4
|
<div class='col-sm-9'>
|
|
5
5
|
<%= text_field_tag :username, nil, {class: 'form-control', autofocus: 'autofocus', placeholder: 'LDAP username'} %>
|
|
6
6
|
</div>
|
|
7
7
|
</div>
|
|
8
|
-
<div class='form-group'>
|
|
9
|
-
<%= label_tag 'password', 'Password', class: 'col-sm-3
|
|
8
|
+
<div class='form-group row'>
|
|
9
|
+
<%= label_tag 'password', 'Password', class: 'col-sm-3 col-form-label' %>
|
|
10
10
|
<div class='col-sm-9'>
|
|
11
11
|
<%= password_field_tag :password, nil, {class: 'form-control bottom', placeholder: 'Password'} %>
|
|
12
12
|
</div>
|
|
13
13
|
</div>
|
|
14
14
|
<% if devise_mapping.rememberable? %>
|
|
15
|
-
<div class='form-group'>
|
|
16
|
-
<div class='col-sm-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
<div class='form-group row'>
|
|
16
|
+
<div class='col-sm-3'></div>
|
|
17
|
+
<div class='col-sm-9'>
|
|
18
|
+
<div class='form-check'>
|
|
19
|
+
<input name='remember_me' value='0' type='hidden'>
|
|
20
|
+
<input class='form-check-input' type='checkbox' name='remember_me' id='remember_me' value='1'>
|
|
21
|
+
<label class='form-check-label' for='gridCheck1'>
|
|
22
|
+
Ricordami
|
|
23
|
+
</label>
|
|
22
24
|
</div>
|
|
23
25
|
</div>
|
|
24
26
|
</div>
|
|
25
27
|
<% end %>
|
|
26
|
-
<div class='form-group'>
|
|
27
|
-
<div class='col-sm-
|
|
28
|
+
<div class='form-group row'>
|
|
29
|
+
<div class='col-sm-3'></div>
|
|
30
|
+
<div class='col-sm-9'>
|
|
28
31
|
<%= submit_tag t('.submit_text'), class: 'btn btn-primary' %>
|
|
29
32
|
</div>
|
|
30
33
|
</div>
|
|
@@ -2,17 +2,20 @@
|
|
|
2
2
|
<%= f.text_field :login, placeholder: t('.login_placeholder') %>
|
|
3
3
|
<%= f.password_field :password, placeholder: 'Password' %>
|
|
4
4
|
<% if devise_mapping.rememberable? %>
|
|
5
|
-
<div class='form-group'>
|
|
6
|
-
<div class='col-sm-
|
|
7
|
-
|
|
5
|
+
<div class='form-group row'>
|
|
6
|
+
<div class='col-sm-3'></div>
|
|
7
|
+
<div class='col-sm-9'>
|
|
8
|
+
<%= f.check_box :remember_me, label: t('.remember_me'), control_col: 'col-sm-2', label_col: 'col-sm-2' %>
|
|
8
9
|
</div>
|
|
9
10
|
</div>
|
|
10
11
|
<% end %>
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
|
|
13
|
+
<div class='form-group row'>
|
|
14
|
+
<div class='col-sm-3'></div>
|
|
15
|
+
<div class='col-sm-9'>
|
|
16
|
+
<%= f.submit t('.submit_text'), class: 'btn btn-primary' %>
|
|
15
17
|
</div>
|
|
18
|
+
</div>
|
|
16
19
|
<hr>
|
|
17
20
|
<p>
|
|
18
21
|
<strong><%= link_to t('.link_text'), new_password_path(resource_name) %> </strong>
|
|
@@ -1,32 +1,37 @@
|
|
|
1
1
|
<div class='container login-box'>
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
<div class='
|
|
5
|
-
|
|
2
|
+
<h4><%= t '.title' %></h4>
|
|
3
|
+
<div class='card'>
|
|
4
|
+
<div class='card-header'>
|
|
6
5
|
<% if ldap_enabled? %>
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
<ul class='nav nav-tabs card-header-tabs' role='tablist'>
|
|
7
|
+
<li class='nav-item'>
|
|
8
|
+
<%= link_to 'LDAP', '#tab-ldap', class: 'nav-link active', id: 'ldap-tab',
|
|
9
|
+
data: {toggle: 'tab'}, aria: {controls: 'ldap', selected: true} %>
|
|
10
|
+
</li>
|
|
11
|
+
<li class='nav-item'>
|
|
12
|
+
<%= link_to 'Standard', '#tab-local', class: 'nav-link', id: 'local-tab',
|
|
13
|
+
data: {toggle: 'tab'}, aria: {controls: 'local', selected: false} %>
|
|
14
|
+
</li>
|
|
15
|
+
</ul>
|
|
16
|
+
</div>
|
|
17
|
+
<div class='tab-content'>
|
|
18
|
+
<div id='tab-ldap' class='tab-pane show active' role='tabpanel' aria-labelledby='ldap-tab'>
|
|
19
|
+
<div class='card-body'>
|
|
20
|
+
<%= render partial: 'devise/sessions/new_ldap' %>
|
|
16
21
|
</div>
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
<div id='tab-local' class='tab-pane'>
|
|
22
|
-
<%= render partial: 'devise/sessions/new_local' %>
|
|
23
|
-
</div>
|
|
22
|
+
</div>
|
|
23
|
+
<div id='tab-local' class='tab-pane' role='tabpanel' aria-labelledby='local-tab'>
|
|
24
|
+
<div class='card-body'>
|
|
25
|
+
<%= render partial: 'devise/sessions/new_local' %>
|
|
24
26
|
</div>
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
</div>
|
|
28
|
+
</div>
|
|
29
|
+
<% else %>
|
|
30
|
+
</div>
|
|
31
|
+
<!-- LDAP not enabled -->
|
|
32
|
+
<div class='card-body'>
|
|
33
|
+
<%= render partial: 'devise/sessions/new_local' %>
|
|
30
34
|
</div>
|
|
35
|
+
<% end %>
|
|
31
36
|
</div>
|
|
32
37
|
</div>
|
data/app/views/locales/en.yml
CHANGED
|
@@ -70,11 +70,11 @@ en:
|
|
|
70
70
|
title: Search for LDAP sers
|
|
71
71
|
submit_text: Search
|
|
72
72
|
name_label: User
|
|
73
|
-
name_help: Search
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
name_help: Search for user-id (exact match)
|
|
74
|
+
fullname_label: Fullname
|
|
75
|
+
fullname_help: Search for first name or surname (also partial match)
|
|
76
76
|
department_label: Department
|
|
77
|
-
department_help: Search
|
|
77
|
+
department_help: Search for department (also partial match)
|
|
78
78
|
limit_label: Limit
|
|
79
79
|
limit_help: Max shown results
|
|
80
80
|
multi_new:
|
data/app/views/locales/it.yml
CHANGED
|
@@ -71,8 +71,8 @@ it:
|
|
|
71
71
|
submit_text: Cerca
|
|
72
72
|
name_label: Utente
|
|
73
73
|
name_help: Ricerca per user-id (match esatto)
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
fullname_label: Nome
|
|
75
|
+
fullname_help: Ricerca per nome o cognome (anche match parziale)
|
|
76
76
|
department_label: Funzione
|
|
77
77
|
department_help: Ricerca per sigla di funzione (anche match parziale)
|
|
78
78
|
limit_label: Limite
|
|
@@ -1,33 +1,25 @@
|
|
|
1
1
|
SimpleNavigation::Configuration.run do |navigation|
|
|
2
2
|
navigation.items do |primary|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
primary.dom_class = 'justify-content-end'
|
|
4
|
+
navigation.selected_class = 'active'
|
|
5
5
|
|
|
6
6
|
if signed_in?
|
|
7
|
-
primary.item :admin,
|
|
8
|
-
{ icon: '
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}, users_path, highlights_on: /\/(users|ldap)(?!\/self_(show|edit|update))/ if can?(:read, User)
|
|
15
|
-
admin.item :logs,
|
|
16
|
-
{ icon: 'fa fa-fw fa-book',
|
|
17
|
-
text: I18n.t('chaltron.menu.logs')
|
|
18
|
-
}, logs_path, highlights_on: /\/logs/ if can?(:read, Log)
|
|
19
|
-
end if can?(:read, User) or can?(:read, Log)
|
|
20
|
-
primary.item :logged, current_user.display_name.html_safe, nil do |user|
|
|
7
|
+
primary.item :admin, I18n.t('chaltron.menu.admin'), '#', link_html: { icon: 'cogs' } do |admin|
|
|
8
|
+
admin.item :users, I18n.t('chaltron.menu.users'), users_path, link_html: { icon: 'users' },
|
|
9
|
+
highlights_on: /\/(users|ldap)(?!\/self_(show|edit|update))/ if can?(:manage, User)
|
|
10
|
+
admin.item :logs, I18n.t('chaltron.menu.logs'), logs_path, link_html: { icon: 'book' },
|
|
11
|
+
highlights_on: /\/logs/ if can?(:read, Log)
|
|
12
|
+
end if can?(:manage, User) or can?(:read, Log)
|
|
13
|
+
primary.item :logged, current_user.display_name.html_safe, '#' do |user|
|
|
21
14
|
user.dom_class = 'dropdown-menu-right'
|
|
22
|
-
user.item :self_edit,
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
destroy_user_session_path, method: :delete
|
|
15
|
+
user.item :self_edit, I18n.t('chaltron.menu.self_show'), self_show_users_path,
|
|
16
|
+
link_html: { icon: 'user'},
|
|
17
|
+
highlights_on: /\/self_(show|edit|update)/
|
|
18
|
+
user.item :logout, 'Logout', destroy_user_session_path, method: :delete,
|
|
19
|
+
link_html: { icon: 'sign-out' }
|
|
28
20
|
end
|
|
29
21
|
else
|
|
30
|
-
primary.item :login, { icon: '
|
|
22
|
+
primary.item :login, 'Login', new_user_session_path, link_html: { icon: 'sign-in' }
|
|
31
23
|
end
|
|
32
24
|
end
|
|
33
25
|
end
|
data/config/locales/en.yml
CHANGED
|
@@ -27,14 +27,9 @@ en:
|
|
|
27
27
|
already_present: Already present!
|
|
28
28
|
logs:
|
|
29
29
|
severity:
|
|
30
|
-
emerg: Emergency
|
|
31
|
-
alert: Alert
|
|
32
|
-
crit: Critical error
|
|
33
|
-
err: Error
|
|
34
|
-
warning: Warning
|
|
35
|
-
notice: Notice
|
|
36
30
|
info: Info
|
|
37
31
|
debug: Debug
|
|
32
|
+
error: Error
|
|
38
33
|
category:
|
|
39
34
|
login: Login
|
|
40
35
|
user_admin: User administration
|
data/config/locales/it.yml
CHANGED
|
@@ -27,14 +27,9 @@ it:
|
|
|
27
27
|
already_present: Giá presente!
|
|
28
28
|
logs:
|
|
29
29
|
severity:
|
|
30
|
-
emerg: Emergenza
|
|
31
|
-
alert: Allarme
|
|
32
|
-
crit: Errore critico
|
|
33
|
-
err: Errore
|
|
34
|
-
warning: Avviso
|
|
35
|
-
notice: Nota
|
|
36
30
|
info: Info
|
|
37
31
|
debug: Debug
|
|
32
|
+
error: Errore
|
|
38
33
|
category:
|
|
39
34
|
login: Login
|
|
40
35
|
user_admin: Amministrazione utenti
|
data/config/routes.rb
CHANGED
|
@@ -15,9 +15,8 @@ Rails.application.routes.draw do
|
|
|
15
15
|
resources :logs, controller: 'chaltron/logs', only: [:index, :show]
|
|
16
16
|
|
|
17
17
|
# search and create LDAP users
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
end
|
|
18
|
+
get 'ldap/search' => 'chaltron/ldap#search'
|
|
19
|
+
post 'ldap/multi_new' => 'chaltron/ldap#multi_new'
|
|
20
|
+
post 'ldap/multi_create' => 'chaltron/ldap#multi_create'
|
|
21
|
+
|
|
23
22
|
end
|
data/lib/chaltron.rb
CHANGED
|
@@ -14,7 +14,7 @@ module Chaltron
|
|
|
14
14
|
@@default_roles = []
|
|
15
15
|
|
|
16
16
|
mattr_accessor :ldap_allow_all
|
|
17
|
-
@@ldap_allow_all =
|
|
17
|
+
@@ldap_allow_all = false
|
|
18
18
|
|
|
19
19
|
mattr_accessor :enable_syslog
|
|
20
20
|
@@enable_syslog = false
|
|
@@ -22,29 +22,6 @@ module Chaltron
|
|
|
22
22
|
mattr_accessor :syslog_facility
|
|
23
23
|
@@syslog_facility = Syslog::LOG_SYSLOG
|
|
24
24
|
|
|
25
|
-
mattr_accessor :ldap_field_mappings
|
|
26
|
-
@@ldap_field_mappings = {
|
|
27
|
-
first_name: 'givenname',
|
|
28
|
-
last_name: 'cn',
|
|
29
|
-
department: 'department',
|
|
30
|
-
email: 'mail'
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
mattr_accessor :ldap_group_base
|
|
34
|
-
@@ldap_group_base = nil
|
|
35
|
-
|
|
36
|
-
mattr_accessor :ldap_group_member_filter
|
|
37
|
-
@@ldap_group_member_filter = -> (entry) { "uniquemember=#{entry.dn}" }
|
|
38
|
-
|
|
39
|
-
mattr_accessor :ldap_role_mappings
|
|
40
|
-
@@ldap_role_mappings = {}
|
|
41
|
-
|
|
42
|
-
mattr_accessor :ldap_after_authenticate
|
|
43
|
-
@@ldap_after_authenticate = -> (user, ldap) { user }
|
|
44
|
-
|
|
45
|
-
mattr_accessor :ldap_before_logout
|
|
46
|
-
@@ldap_before_logout = -> (user, ldap) { }
|
|
47
|
-
|
|
48
25
|
def self.setup
|
|
49
26
|
yield self
|
|
50
27
|
end
|
|
@@ -5,7 +5,7 @@ class BootstrapForm::FormBuilder
|
|
|
5
5
|
checked = @object.nil?? false : @object.roles
|
|
6
6
|
html = inputs_collection(:roles, collection, :first, :last, checked: checked) do |name, value, options|
|
|
7
7
|
options[:multiple] = true
|
|
8
|
-
options[:inline] =
|
|
8
|
+
options[:inline] = true
|
|
9
9
|
|
|
10
10
|
if value == opts[:disabled]
|
|
11
11
|
options[:disabled] = true
|