symphonia 3.2.1 → 3.2.2
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 +4 -4
- data/app/controllers/symphonia/users_controller.rb +1 -1
- data/app/views/symphonia/accounts/_form.html.erb +19 -8
- data/app/views/symphonia/accounts/edit.html.erb +2 -2
- data/app/views/symphonia/users/_form.html.erb +7 -7
- data/app/views/symphonia/users/edit.html.erb +17 -15
- data/app/views/symphonia/users/new.html.erb +2 -2
- data/lib/symphonia/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d333a60e811eafab34bc7cf19131425076712d3f3b20ab9fee7ddb8fd9f94898
|
|
4
|
+
data.tar.gz: 38f357ed23b77df8e7dee365b11da243394242f3b2f06895b78d03dae245b9b6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9c5ba3f62d587b04eb5a61623149960a5192b1f86ee18e9c8aa6376bd777dbcce204f12d70296c8792c25223af987bfbad549a30a0b5713cd2626d6ad7160667
|
|
7
|
+
data.tar.gz: 878e92fc583be0808d9647602adf067f0338824bc5ea8f45073fc02681812d9d845fdf81f2b0ab70bdfdd874d9ddab64516cb7b931eaeb2edc8b087fcc7120cc
|
|
@@ -80,7 +80,7 @@ module Symphonia
|
|
|
80
80
|
format.any(:json, :xml) { head :no_content }
|
|
81
81
|
else
|
|
82
82
|
format.html do
|
|
83
|
-
@roles = Symphonia::Role.
|
|
83
|
+
@roles = Symphonia::Role.sorted
|
|
84
84
|
render action: 'edit'
|
|
85
85
|
end
|
|
86
86
|
format.xml { render xml: @user.errors, status: :unprocessable_entity }
|
|
@@ -1,9 +1,20 @@
|
|
|
1
|
-
<div class="row">
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
<div class="col-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
<div class="row justify-content-center">
|
|
2
|
+
<div class="col-lg-8">
|
|
3
|
+
<%= f.email_field :email, required: true %>
|
|
4
|
+
</div>
|
|
5
|
+
<div class="col-lg-8">
|
|
6
|
+
<%= f.text_field :first_name, required: true %>
|
|
7
|
+
|
|
8
|
+
</div>
|
|
9
|
+
<div class="col-lg-8">
|
|
10
|
+
<%= f.text_field :last_name, required: true %>
|
|
11
|
+
|
|
12
|
+
</div>
|
|
13
|
+
<div class="col-lg-8">
|
|
14
|
+
<% if f.object.external_id.blank? %>
|
|
15
|
+
<%= f.password_field :password, required: f.object.new_record?, prepend: icon('key') %>
|
|
16
|
+
<% end %>
|
|
17
|
+
</div>
|
|
9
18
|
</div>
|
|
19
|
+
|
|
20
|
+
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<%= title(@user.name) %>
|
|
2
|
-
<%= symphonia_form_for(@user, :
|
|
3
|
-
<%= render(:
|
|
2
|
+
<%= symphonia_form_for(@user, url: { action: 'update' }) do |f| %>
|
|
3
|
+
<%= render(partial: @user.form_path, locals: { f: f }) %>
|
|
4
4
|
|
|
5
5
|
<div class="buttons">
|
|
6
6
|
<%= link_to_back %>
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
<%= render(partial: 'symphonia/accounts/form', locals: {f: f}) %>
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
<div class="col-
|
|
1
|
+
<%= render(partial: 'symphonia/accounts/form', locals: { f: f }) %>
|
|
2
|
+
<% if Symphonia::User.current.admin? %>
|
|
3
|
+
<div class="row justify-content-center">
|
|
4
|
+
<div class="col-8">
|
|
5
5
|
<%= f.check_box :admin, id: 'user_admin', layout: :inline %>
|
|
6
6
|
</div>
|
|
7
7
|
<% if @roles.any? %>
|
|
8
|
-
<div class="col-
|
|
8
|
+
<div class="col-9">
|
|
9
9
|
<%= f.select(:role_id, options_from_collection_for_select(@roles, :id, :name, selected: @user.role_id), include_blank: true, layout: :horizontal) %>
|
|
10
10
|
</div>
|
|
11
11
|
<% end -%>
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
</div>
|
|
13
|
+
<% end %>
|
|
@@ -4,22 +4,24 @@
|
|
|
4
4
|
<%= render(partial: 'form', locals: { f: f }) %>
|
|
5
5
|
|
|
6
6
|
<% if @user && !@user.new_record? && Symphonia::User.current.logged_in? && (prefs = Symphonia::EmailPreference.visible.to_a).any? %>
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
<div class="
|
|
14
|
-
<
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
7
|
+
<div class="row justify-content-center">
|
|
8
|
+
<%= hidden_field_tag 'user[preference_ids][]' %>
|
|
9
|
+
<fieldset id="users-notifications-map" class="col-8">
|
|
10
|
+
<%= content_tag(:legend, t(:label_user_notifications)) %>
|
|
11
|
+
<div class="row">
|
|
12
|
+
<% prefs.each do |pref| %>
|
|
13
|
+
<div class="col-6">
|
|
14
|
+
<div class="form-check">
|
|
15
|
+
<label class="form-check-label">
|
|
16
|
+
<%= check_box_tag('user[preference_ids][]', pref.id, @user.preference_ids.include?(pref.id), class: 'form-check-input') %>
|
|
17
|
+
<%= t(pref.name, scope: :preferences) %>
|
|
18
|
+
</label>
|
|
19
|
+
</div>
|
|
18
20
|
</div>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
</
|
|
22
|
-
</
|
|
21
|
+
<% end %>
|
|
22
|
+
</div>
|
|
23
|
+
</fieldset>
|
|
24
|
+
</div>
|
|
23
25
|
<% end %>
|
|
24
26
|
|
|
25
27
|
<%= f.primary unless request.xhr? %>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<%= title(t(:label_user_new), back: true) %>
|
|
2
2
|
|
|
3
|
-
<%= symphonia_form_for(@user, html: {novalidate: true}) do |f| %>
|
|
4
|
-
<%= render(partial: 'form', locals: {f: f}) %>
|
|
3
|
+
<%= symphonia_form_for(@user, html: { novalidate: true }) do |f| %>
|
|
4
|
+
<%= render(partial: 'form', locals: { f: f }) %>
|
|
5
5
|
<%= f.form_group do %>
|
|
6
6
|
<%= f.primary(t(:button_create)) %>
|
|
7
7
|
<% end %>
|
data/lib/symphonia/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: symphonia
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.2.
|
|
4
|
+
version: 3.2.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Lukas Pokorny
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-05-
|
|
11
|
+
date: 2020-05-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -282,14 +282,14 @@ dependencies:
|
|
|
282
282
|
requirements:
|
|
283
283
|
- - "~>"
|
|
284
284
|
- !ruby/object:Gem::Version
|
|
285
|
-
version:
|
|
285
|
+
version: 6.0.7
|
|
286
286
|
type: :runtime
|
|
287
287
|
prerelease: false
|
|
288
288
|
version_requirements: !ruby/object:Gem::Requirement
|
|
289
289
|
requirements:
|
|
290
290
|
- - "~>"
|
|
291
291
|
- !ruby/object:Gem::Version
|
|
292
|
-
version:
|
|
292
|
+
version: 6.0.7
|
|
293
293
|
- !ruby/object:Gem::Dependency
|
|
294
294
|
name: mini_racer
|
|
295
295
|
requirement: !ruby/object:Gem::Requirement
|