decidim-system 0.17.2 → 0.18.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of decidim-system might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/commands/decidim/system/register_organization.rb +1 -0
- data/app/commands/decidim/system/update_organization.rb +1 -0
- data/app/forms/decidim/system/register_organization_form.rb +1 -0
- data/app/forms/decidim/system/update_organization_form.rb +22 -0
- data/app/views/decidim/system/organizations/_smtp_settings.html.erb +20 -0
- data/app/views/decidim/system/organizations/edit.html.erb +2 -0
- data/app/views/decidim/system/organizations/new.html.erb +2 -0
- data/config/locales/ar-SA.yml +1 -0
- data/config/locales/ar.yml +76 -0
- data/config/locales/ca.yml +1 -0
- data/config/locales/en.yml +1 -0
- data/config/locales/es-MX.yml +1 -0
- data/config/locales/es-PY.yml +1 -0
- data/config/locales/es.yml +1 -0
- data/config/locales/fi-plain.yml +1 -0
- data/config/locales/fi.yml +1 -0
- data/config/locales/hu.yml +1 -0
- data/config/locales/it.yml +1 -0
- data/config/locales/sv.yml +1 -0
- data/config/locales/tr-TR.yml +1 -0
- data/lib/decidim/system/version.rb +1 -1
- metadata +9 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 79e6b530cfbdb52def4cbebf63e1daf79b920f9a61363166a94d3f34824bc76d
|
4
|
+
data.tar.gz: c1f09078361a985f5636629e983b6e7c9c4e5630f22a5bfda0c7730c0541dd7a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 93a642ae05d89ccec25eecf6e499b47563b4462dd044feac73a11b4be3f23cd6c2482e3ae940a8dfd315e01d5b90ca85778c81ec26030a279eed83446881d1ba
|
7
|
+
data.tar.gz: ca87e5df6d8da74ed0d2fc13b05bb07ac67575f8c0f81667175f62c67773cac60ff345f6bf26a2d0022ccc61869e4bc0108d8e84c908f0991a13ce622bfba1e0
|
@@ -46,6 +46,7 @@ module Decidim
|
|
46
46
|
organization.secondary_hosts = form.clean_secondary_hosts
|
47
47
|
organization.available_authorizations = form.clean_available_authorizations
|
48
48
|
organization.users_registration_mode = form.users_registration_mode
|
49
|
+
organization.smtp_settings = form.encrypted_smtp_settings
|
49
50
|
|
50
51
|
organization.save!
|
51
52
|
end
|
@@ -8,6 +8,7 @@ module Decidim
|
|
8
8
|
#
|
9
9
|
class UpdateOrganizationForm < Form
|
10
10
|
include TranslatableAttributes
|
11
|
+
include JsonbAttributes
|
11
12
|
|
12
13
|
mimic :organization
|
13
14
|
|
@@ -16,6 +17,17 @@ module Decidim
|
|
16
17
|
attribute :secondary_hosts, String
|
17
18
|
attribute :available_authorizations, Array[String]
|
18
19
|
attribute :users_registration_mode, String
|
20
|
+
jsonb_attribute :smtp_settings, [
|
21
|
+
[:from, String],
|
22
|
+
[:user_name, String],
|
23
|
+
[:encrypted_password, String],
|
24
|
+
[:address, String],
|
25
|
+
[:port, Integer],
|
26
|
+
[:authentication, String],
|
27
|
+
[:enable_starttls_auto, Boolean]
|
28
|
+
]
|
29
|
+
|
30
|
+
attr_writer :password
|
19
31
|
|
20
32
|
validates :name, :host, :users_registration_mode, presence: true
|
21
33
|
validate :validate_organization_uniqueness
|
@@ -27,14 +39,24 @@ module Decidim
|
|
27
39
|
|
28
40
|
def clean_secondary_hosts
|
29
41
|
return unless secondary_hosts
|
42
|
+
|
30
43
|
secondary_hosts.split("\n").map(&:chomp).select(&:present?)
|
31
44
|
end
|
32
45
|
|
33
46
|
def clean_available_authorizations
|
34
47
|
return unless available_authorizations
|
48
|
+
|
35
49
|
available_authorizations.select(&:present?)
|
36
50
|
end
|
37
51
|
|
52
|
+
def password
|
53
|
+
Decidim::AttributeEncryptor.decrypt(encrypted_password) unless encrypted_password.nil?
|
54
|
+
end
|
55
|
+
|
56
|
+
def encrypted_smtp_settings
|
57
|
+
smtp_settings.merge(encrypted_password: Decidim::AttributeEncryptor.encrypt(@password))
|
58
|
+
end
|
59
|
+
|
38
60
|
private
|
39
61
|
|
40
62
|
def validate_organization_uniqueness
|
@@ -0,0 +1,20 @@
|
|
1
|
+
<div class="fieldset">
|
2
|
+
<h4><%= t("decidim.system.models.organization.fields.smtp_settings") %></h4>
|
3
|
+
<%= f.fields_for :smtp_settings do %>
|
4
|
+
<div class="field">
|
5
|
+
<%= f.email_field :from %>
|
6
|
+
</div>
|
7
|
+
<div class="field">
|
8
|
+
<%= f.text_field :user_name %>
|
9
|
+
</div>
|
10
|
+
<div class="field">
|
11
|
+
<%= f.text_field :password %>
|
12
|
+
</div>
|
13
|
+
<div class="field">
|
14
|
+
<%= f.text_field :address %>
|
15
|
+
</div>
|
16
|
+
<div class="field">
|
17
|
+
<%= f.number_field :port %>
|
18
|
+
</div>
|
19
|
+
<% end %>
|
20
|
+
</div>
|
@@ -25,6 +25,8 @@
|
|
25
25
|
<%= f.collection_check_boxes :available_authorizations, Decidim.authorization_workflows, :name, :description %>
|
26
26
|
</div>
|
27
27
|
|
28
|
+
<%= render partial: "smtp_settings", locals: { f: f } %>
|
29
|
+
|
28
30
|
<div class="actions">
|
29
31
|
<%= f.submit t("decidim.system.actions.save") %>
|
30
32
|
</div>
|
@@ -66,6 +66,8 @@
|
|
66
66
|
<%= f.collection_check_boxes :available_authorizations, Decidim.authorization_workflows, :name, :description %>
|
67
67
|
</div>
|
68
68
|
|
69
|
+
<%= render partial: "smtp_settings", locals: { f: f } %>
|
70
|
+
|
69
71
|
<div class="actions">
|
70
72
|
<%= f.submit t("decidim.system.models.organization.actions.save_and_invite") %>
|
71
73
|
</div>
|
data/config/locales/ar-SA.yml
CHANGED
@@ -0,0 +1,76 @@
|
|
1
|
+
ar:
|
2
|
+
decidim:
|
3
|
+
system:
|
4
|
+
actions:
|
5
|
+
confirm_destroy: هل أنت متأكد أنك تريد حذف هذا؟
|
6
|
+
destroy: حذف
|
7
|
+
edit: تعديل
|
8
|
+
new: الجديد
|
9
|
+
save: حفظ
|
10
|
+
title: أفعال
|
11
|
+
admins:
|
12
|
+
create:
|
13
|
+
error: كانت هناك مشكلة في إنشاء مسؤول جديد.
|
14
|
+
success: تم إنشاء المشرف بنجاح
|
15
|
+
destroy:
|
16
|
+
success: تم حذف المشرف بنجاح
|
17
|
+
edit:
|
18
|
+
title: تحرير المشرف
|
19
|
+
update: تحديث
|
20
|
+
index:
|
21
|
+
title: مدراء
|
22
|
+
new:
|
23
|
+
create: إنشاء
|
24
|
+
title: المشرف الجديد
|
25
|
+
update:
|
26
|
+
error: حدثت مشكلة أثناء تحديث هذا المشرف.
|
27
|
+
success: تم تحديث المشرف بنجاح
|
28
|
+
default_pages:
|
29
|
+
placeholders:
|
30
|
+
content: يرجى إضافة محتوى ذي معنى إلى الصفحة الثابتة %{page} في لوحة تحكم المشرف.
|
31
|
+
title: العنوان الافتراضي ل %{page}
|
32
|
+
menu:
|
33
|
+
admins: مدراء
|
34
|
+
dashboard: لوحة القيادة
|
35
|
+
organizations: المنظمات
|
36
|
+
models:
|
37
|
+
admin:
|
38
|
+
fields:
|
39
|
+
created_at: أنشئت في
|
40
|
+
email: البريد الإلكتروني
|
41
|
+
name: مشرف
|
42
|
+
validations:
|
43
|
+
email_uniqueness: يوجد مشرف آخر بنفس البريد الإلكتروني بالفعل
|
44
|
+
organization:
|
45
|
+
actions:
|
46
|
+
save_and_invite: إنشاء منظمة ودعوة المشرف
|
47
|
+
fields:
|
48
|
+
created_at: أنشئت في
|
49
|
+
name: اسم
|
50
|
+
smtp_settings: إعدادات الـ SMTP
|
51
|
+
name: منظمة
|
52
|
+
organizations:
|
53
|
+
create:
|
54
|
+
error: كانت هناك مشكلة في إنشاء منظمة جديدة.
|
55
|
+
success: تم إنشاء المنظمة بنجاح.
|
56
|
+
edit:
|
57
|
+
secondary_hosts_hint: أدخل كل واحد منهم في سطر جديد
|
58
|
+
index:
|
59
|
+
title: المنظمات
|
60
|
+
new:
|
61
|
+
reference_prefix_hint: يتم استخدام بادئة المرجع لتعريف الموارد بشكل فريد في كل المؤسسة
|
62
|
+
secondary_hosts_hint: أدخل كل واحد منهم في سطر جديد
|
63
|
+
title: منظمة جديدة
|
64
|
+
update:
|
65
|
+
error: حدثت مشكلة أثناء تحديث هذه المؤسسة.
|
66
|
+
success: تم تحديث المنظمة بنجاح.
|
67
|
+
users_registration_mode:
|
68
|
+
disabled: يمكن فقط الوصول باستخدام الحسابات الخارجية
|
69
|
+
enabled: السماح للمشاركين بالتسجيل والدخول
|
70
|
+
existing: لا تسمح للمشاركين بالتسجيل ، لكن اسمح للمشاركين الحاليين بتسجيل الدخول
|
71
|
+
shared:
|
72
|
+
notices:
|
73
|
+
no_organization_warning_html: يجب عليك إنشاء منظمة للبدء. تأكد من قراءة %{guide} قبل المتابعة.
|
74
|
+
our_getting_started_guide: لدينا دليل البدء
|
75
|
+
titles:
|
76
|
+
dashboard: لوحة القيادة
|
data/config/locales/ca.yml
CHANGED
data/config/locales/en.yml
CHANGED
data/config/locales/es-MX.yml
CHANGED
data/config/locales/es-PY.yml
CHANGED
data/config/locales/es.yml
CHANGED
data/config/locales/fi-plain.yml
CHANGED
data/config/locales/fi.yml
CHANGED
data/config/locales/hu.yml
CHANGED
data/config/locales/it.yml
CHANGED
data/config/locales/sv.yml
CHANGED
data/config/locales/tr-TR.yml
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-system
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.18.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josep Jaume Rey Peroy
|
@@ -32,28 +32,28 @@ dependencies:
|
|
32
32
|
requirements:
|
33
33
|
- - '='
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: 0.
|
35
|
+
version: 0.18.0
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
40
|
- - '='
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.
|
42
|
+
version: 0.18.0
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: devise
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
47
|
- - "~>"
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: '4.
|
49
|
+
version: '4.6'
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
54
|
- - "~>"
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: '4.
|
56
|
+
version: '4.6'
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: devise-i18n
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
@@ -136,14 +136,14 @@ dependencies:
|
|
136
136
|
requirements:
|
137
137
|
- - '='
|
138
138
|
- !ruby/object:Gem::Version
|
139
|
-
version: 0.
|
139
|
+
version: 0.18.0
|
140
140
|
type: :development
|
141
141
|
prerelease: false
|
142
142
|
version_requirements: !ruby/object:Gem::Requirement
|
143
143
|
requirements:
|
144
144
|
- - '='
|
145
145
|
- !ruby/object:Gem::Version
|
146
|
-
version: 0.
|
146
|
+
version: 0.18.0
|
147
147
|
description: System administration to create new organization in an installation.
|
148
148
|
email:
|
149
149
|
- josepjaume@gmail.com
|
@@ -199,6 +199,7 @@ files:
|
|
199
199
|
- app/views/decidim/system/devise/passwords/new.html.erb
|
200
200
|
- app/views/decidim/system/devise/sessions/new.html.erb
|
201
201
|
- app/views/decidim/system/devise/shared/_links.html.erb
|
202
|
+
- app/views/decidim/system/organizations/_smtp_settings.html.erb
|
202
203
|
- app/views/decidim/system/organizations/edit.html.erb
|
203
204
|
- app/views/decidim/system/organizations/index.html.erb
|
204
205
|
- app/views/decidim/system/organizations/new.html.erb
|
@@ -210,6 +211,7 @@ files:
|
|
210
211
|
- app/views/layouts/decidim/system/application.html.erb
|
211
212
|
- app/views/layouts/decidim/system/login.html.erb
|
212
213
|
- config/locales/ar-SA.yml
|
214
|
+
- config/locales/ar.yml
|
213
215
|
- config/locales/ca.yml
|
214
216
|
- config/locales/cs-CZ.yml
|
215
217
|
- config/locales/cs.yml
|