decidim-system 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93fc93db2fd066bb3028e68ede19952d8663ca6feba21b8ba635bc970f2562c8
-  data.tar.gz: 43228acf2a00657f0310a7012b1b74c76195f7f5cd691a1d4f0cadad5e0d3f52
+  metadata.gz: 9a13e278028184766cd3a5a7a2f3c225a42a231e4d1ea790fdd3e2a7049b2446
+  data.tar.gz: 16990b3fb9011f5296039152d4017d689b4fa924f7f5877a7fcbba39a2aaa526
 SHA512:
-  metadata.gz: e65822b2a26524db66ff27362d563366140319ef4562c87374bdc3a316292c0a7004859b24c085c2b9b243610e925f333c5c848f76382ed2d189ba5f49635105
-  data.tar.gz: 10466f7b43f6f2cd772305bed242803044b8c388fd02b4c90277a30f0755fbeeff5a54a7ff20051be52d3ef0c19c6c06d20cafff614e28fbe432f7182aa6a376
+  metadata.gz: ccf6a125d14b87455c6d37eea06cb1bb65d8b6bb81c9f205c6ecd671d89a7f7538970684406689eddbf7fa16be0c8fb501c5ec0f7a740ebb1de676d1bde66a5e
+  data.tar.gz: 0d15b289d10046b71e486af2f553f909c6dd7edaba01e4f0666146207b725f3866c6818d002efb2211284936a68ea0f1d331b6eaa75d597f1db7c68c67c46c73

data/README.md

@@ -40,22 +40,34 @@ When using Decidim as multi-tenant, you should keep these in mind:
 
 ## Managing System admins
 
-Currently Decidim doesn't provide a way to create the first System Admin in a new deployment. To do it, you should open a Rails console in your application and
-create it:
+For logging in to this dashboard, you'll need to create a system admin account from your terminal:
 
-```ruby
-Decidim::System::Admin.create!(
-  email: "your-email@example.org",
-  password: "your-safe-password",
-  password_confirmation: "your-safe-password"
-)
+```bash
+bin/rails decidim_system:create_admin
 ```
 
-Once you have created your first admin you can access the system dashboard at `https://your-decidim-deployment-host/system` and login with your newly created user.
+You'll be asked for an email and a password. For security, the password will not get displayed back at you and you'll need to confirm it.
+
+Once you have created your first admin you can access the system dashboard at `/system`. For instance, if you have Decidim running at `https://example.org`, this URL would be `https://example.org/system`.
+You'll be able to login with your newly created user.
+
 From the system dashboard you can add new admins.
 
 ⚠️ If you need to reset your administrator password you'll need to do it by entering the Rails console and changing it manually. ⚠️
 
+. Open the rails console:
+```bash
+bin/rails console
+```
+. Run the following instructions, changing them accordingly:
+```ruby
+system_admin = Decidim::System::Admin.order(:id).first                        # for the first system admin
+system_admin = Decidim::System::Admin.find_by_email "system@example.org"      # if you already know the email
+system_admin.password = "decidim123456789"                                    # change for something secure
+system_admin.password_confirmation = "decidim123456789"
+system_admin.save
+```
+
 ## Managing organizations
 
 Once you have your system admin setup you can also start managing the organizations in your deploy. To do it, login at the system dashboard and create a new organization

data/app/commands/decidim/system/create_admin.rb

@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic when creating a new admin in
     # the system.
-    class CreateAdmin < Rectify::Command
+    class CreateAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/commands/decidim/system/create_default_content_blocks.rb

@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic to create the default content blocks
     # for a newly-created organization.
-    class CreateDefaultContentBlocks < Rectify::Command
+    class CreateDefaultContentBlocks < Decidim::Command
       DEFAULT_CONTENT_BLOCKS =
         [:hero, :sub_hero, :highlighted_content_banner, :how_to_participate, :stats, :metrics, :footer_sub_hero].freeze
 

data/app/commands/decidim/system/create_default_pages.rb

@@ -5,7 +5,7 @@ module Decidim
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
-    class CreateDefaultPages < Rectify::Command
+    class CreateDefaultPages < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/commands/decidim/system/create_oauth_application.rb

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # Creates an OAuthApplication.
-    class CreateOAuthApplication < Rectify::Command
+    class CreateOAuthApplication < Decidim::Command
       # Initializes the command.
       #
       # form - The source fo data for this OAuthApplication.

data/app/commands/decidim/system/destroy_oauth_application.rb

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # This command deals with destroying an application from the admin panel.
-    class DestroyOAuthApplication < Rectify::Command
+    class DestroyOAuthApplication < Decidim::Command
       # Public: Initializes the command.
       #
       # application - The OAuthApplication to be destroyed.

data/app/commands/decidim/system/populate_help.rb

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # A command that will create default help pages for an organization.
-    class PopulateHelp < Rectify::Command
+    class PopulateHelp < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - An organization
@@ -49,8 +49,8 @@ module Decidim
         end
       end
 
-      def multi_translation(key, *arguments)
-        Decidim::TranslationsHelper.multi_translation(key, @organization.available_locales, *arguments)
+      def multi_translation(key, **arguments)
+        Decidim::TranslationsHelper.multi_translation(key, @organization.available_locales, **arguments)
       end
     end
   end

data/app/commands/decidim/system/register_organization.rb

@@ -5,7 +5,7 @@ module Decidim
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
-    class RegisterOrganization < Rectify::Command
+    class RegisterOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
@@ -24,6 +24,7 @@ module Decidim
 
         @organization = nil
         invite_form = nil
+        invitation_failed = false
 
         transaction do
           @organization = create_organization
@@ -31,8 +32,10 @@ module Decidim
           PopulateHelp.call(@organization)
           CreateDefaultContentBlocks.call(@organization)
           invite_form = invite_user_form(@organization)
-          return broadcast(:invalid) if invite_form.invalid?
+          invitation_failed = invite_form.invalid?
         end
+        return broadcast(:invalid) if invitation_failed
+
         Decidim::InviteUser.call(invite_form) if @organization && invite_form
 
         broadcast(:ok)

data/app/commands/decidim/system/update_admin.rb

@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic when updating an admin in
     # the system.
-    class UpdateAdmin < Rectify::Command
+    class UpdateAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/commands/decidim/system/update_oauth_application.rb

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # Updates the OAuth application given form data.
-    class UpdateOAuthApplication < Rectify::Command
+    class UpdateOAuthApplication < Decidim::Command
       # Initializes the command.
       #
       # application - The OAuthApplication to update.

data/app/commands/decidim/system/update_organization.rb

@@ -5,7 +5,7 @@ module Decidim
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
-    class UpdateOrganization < Rectify::Command
+    class UpdateOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/controllers/decidim/system/application_controller.rb

@@ -11,7 +11,6 @@ module Decidim
 
       protect_from_forgery with: :exception, prepend: true
 
-      helper Decidim::MetaTagsHelper
       helper Decidim::TranslationsHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper

data/app/forms/decidim/system/admin_form.rb

@@ -12,7 +12,7 @@ module Decidim
       attribute :password_confirmation, String
 
       validates :email, presence: true
-      validates :password, confirmation: true, presence: true, unless: :admin_exists?
+      validates :password, presence: true, unless: :admin_exists?
       validates :password_confirmation, presence: true, unless: :admin_exists?
 
       validates :password, password: { email: :email }

data/app/forms/decidim/system/file_upload_settings_form.rb

@@ -10,34 +10,31 @@ module Decidim
 
       mimic :organization_file_uploads
 
-      attribute :allowed_file_extensions, Hash[Symbol => String]
-      attribute :allowed_content_types, Hash[Symbol => String]
-      attribute :maximum_file_size, Hash[Symbol => Float]
+      attribute(:allowed_file_extensions, { Symbol => String })
+      attribute(:allowed_content_types, { Symbol => String })
+      attribute(:maximum_file_size, { Symbol => Float })
 
       def map_model(settings_hash)
-        settings_hash = begin
-          if settings_hash.is_a?(Hash)
-            default_settings.deep_merge(settings_hash.deep_stringify_keys)
-          else
-            default_settings
-          end
-        end
+        settings_hash = if settings_hash.is_a?(Hash)
+                          default_settings.deep_merge(settings_hash.deep_stringify_keys)
+                        else
+                          default_settings
+                        end
 
-        attribute_set.each do |attr|
-          key = attr.name.to_s
-          next unless settings_hash.has_key?(key)
+        csv_attributes.each do |attr|
+          next unless settings_hash.has_key?(attr.to_s)
 
           # For the view, the array values need to be in comma separated format
           # in order for them to work correctly with the tags inputs.
-          value = Rectify::FormAttribute.new(attr).value_from(
-            settings_hash[key]
-          )
+          value = settings_hash[attr.to_s]
           value.each do |k, v|
             value[k] = v.join(",") if v.is_a?(Array)
           end
 
-          self[key] = value
+          send("#{attr}=", value)
         end
+
+        self.maximum_file_size = settings_hash["maximum_file_size"]
       end
 
       # This turns the attributes passed from the view into the final
@@ -46,8 +43,7 @@ module Decidim
       # the view layer. Before we save those attributes, they need to be
       # converted into arrays which is what this method does.
       def final
-        csv_attributes = [:allowed_file_extensions, :allowed_content_types]
-        attributes.tap do |attr|
+        to_h.tap do |attr|
           csv_attributes.each do |key|
             attr[key] = csv_array_setting(attr[key])
           end
@@ -60,6 +56,10 @@ module Decidim
         Decidim::OrganizationSettings.default(:upload)
       end
 
+      def csv_attributes
+        @csv_attributes ||= [:allowed_file_extensions, :allowed_content_types]
+      end
+
       def csv_array_setting(original)
         original.transform_values do |value|
           value.split(",")

data/app/forms/decidim/system/update_organization_form.rb

@@ -29,7 +29,6 @@ module Decidim
         [:authentication, String],
         [:enable_starttls_auto, Boolean]
       ]
-      attribute :password, String
       attribute :file_upload_settings, FileUploadSettingsForm
 
       OMNIATH_PROVIDERS_ATTRIBUTES = Decidim::OmniauthProvider.available.keys.map do |provider|
@@ -44,6 +43,8 @@ module Decidim
 
       jsonb_attribute :omniauth_settings, OMNIATH_PROVIDERS_ATTRIBUTES
 
+      attr_writer :password
+
       validates :name, :host, :users_registration_mode, presence: true
       validate :validate_organization_uniqueness
       validates :users_registration_mode, inclusion: { in: Decidim::Organization.users_registration_modes }
@@ -69,13 +70,13 @@ module Decidim
       end
 
       def password
-        encrypted_password.nil? ? super : Decidim::AttributeEncryptor.decrypt(encrypted_password)
+        Decidim::AttributeEncryptor.decrypt(encrypted_password) unless encrypted_password.nil?
       end
 
       def encrypted_smtp_settings
         smtp_settings["from"] = set_from
 
-        smtp_settings.merge(encrypted_password: Decidim::AttributeEncryptor.encrypt(password))
+        smtp_settings.merge(encrypted_password: Decidim::AttributeEncryptor.encrypt(@password))
       end
 
       def set_from

data/app/helpers/decidim/system/application_helper.rb

@@ -10,10 +10,6 @@ module Decidim
       def title
         "Decidim"
       end
-
-      def current_admin?(admin)
-        current_admin == admin
-      end
     end
   end
 end

data/app/packs/entrypoints/decidim_system.js

@@ -1,2 +1,3 @@
 import "src/decidim/system/application"
 import "entrypoints/decidim_system.scss"
+import "src/decidim/direct_uploads/upload_field"

data/app/packs/stylesheets/decidim/system/application.scss

@@ -15,6 +15,7 @@ $-zf-bp-value: null;
 @import "stylesheets/decidim/system/forms";
 @import "stylesheets/decidim/editor";
 @import "stylesheets/decidim/utils/fontface";
+@import "stylesheets/decidim/modules/upload_modal";
 
 body{
   font-family: 'Source Sans Pro', sans-serif;

data/app/views/decidim/system/admins/edit.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>

data/app/views/decidim/system/admins/index.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
@@ -27,9 +25,7 @@
         </td>
         <td class="actions">
           <%= link_to t("actions.edit", scope: "decidim.system"), [:edit, admin] %>
-          <% unless current_admin?(admin) %>
-            <%= link_to t("actions.destroy", scope: "decidim.system"), admin, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.system") } %>
-          <% end %>
+          <%= link_to t("actions.destroy", scope: "decidim.system"), admin, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.system") } %>
         </td>
       </tr>
     <% end %>

data/app/views/decidim/system/admins/new.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>

data/app/views/decidim/system/admins/show.html.erb

@@ -4,6 +4,6 @@
 
 <div class="actions">
   <hr>
-  <%= link_to t(".edit"), ["edit", @admin] %>
-  <%= link_to t(".destroy"), @admin, method: :delete, class: "alert button", data: { confirm: "Are you sure you want to do this?" } %>
+  <%= link_to "Edit", ["edit", @admin] %>
+  <%= link_to "Destroy", @admin, method: :delete, class: "alert button", data: { confirm: "Are you sure you want to do this?" } %>
 </div>

data/app/views/decidim/system/dashboard/show.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t("decidim.system.titles.dashboard")) %>
-
 <% provide :title do %>
   <h2><%= t("decidim.system.titles.dashboard") %></h2>
   <h3><%= t ".current_organizations" %></h3>

data/app/views/decidim/system/devise/passwords/edit.html.erb

@@ -1,4 +1,4 @@
-<h2> <%= link_to t(".change_your_password") %></h2>
+<h2>Change your password</h2>
 
 <%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
   <%= render "devise/shared/error_messages", resource: resource %>
@@ -6,7 +6,7 @@
 
   <div class="field">
     <% if @minimum_password_length %>
-      <em><%= t(".minimum_characters", minimum: @minimum_password_length) %></em><br>
+      <em>(<%= @minimum_password_length %> characters minimum)</em><br>
     <% end %>
     <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
   </div>

data/app/views/decidim/system/devise/passwords/new.html.erb

@@ -1,4 +1,4 @@
-<h2><%= link_to t(".forgot_your_password") %></h2>
+<h2>Forgot your password?</h2>
 
 <%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= render "devise/shared/error_messages", resource: resource %>
@@ -8,7 +8,7 @@
   </div>
 
   <div class="actions">
-    <%= f.submit t(".send_me_reset_password_instructions") %>
+    <%= f.submit "Send me reset password instructions" %>
   </div>
 <% end %>
 

data/app/views/decidim/system/devise/sessions/new.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t("log_in", scope: "decidim.system.devise.shared.links") %></h2>
+<h2>Log in</h2>
 
 <%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
@@ -16,7 +16,7 @@
   <% end -%>
 
   <div class="actions">
-    <%= f.submit t("log_in", scope: "decidim.system.devise.shared.links") %>
+    <%= f.submit "Log in" %>
   </div>
 <% end %>
 

data/app/views/decidim/system/devise/shared/_links.html.erb

@@ -1,19 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to t(".log_in"), new_session_path(resource_name) %>
+  <%= link_to "Log in", new_session_path(resource_name) %><br>
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to t(".sign_up"), new_registration_path(resource_name) %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br>
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to t(".forgot_your_password?"), new_password_path(resource_name) %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br>
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to t(".did_not_receive_confirmation_instructions?"), new_confirmation_path(resource_name) %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br>
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to t(".did_not_receive_unlock_instructions?"), new_unlock_path(resource_name) %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br>
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
+    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br>
+  <% end -%>
 <% end -%>

data/app/views/decidim/system/oauth_applications/edit.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <%= decidim_form_for(@form, html: { class: "form edit_oauth_application" }) do |f| %>
   <div class="card">
     <div class="card-divider">

data/app/views/decidim/system/oauth_applications/index.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>

data/app/views/decidim/system/oauth_applications/new.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <%= decidim_form_for(@form, html: { class: "form new_oauth_application" }) do |f| %>
   <div class="card">
     <div class="card-divider">

data/app/views/decidim/system/oauth_applications/show.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(@oauth_application.name) %>
-
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= @oauth_application.name %></h2>

data/app/views/decidim/system/organizations/edit.html.erb

@@ -1,9 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
-<% provide :title do %>
-  <h1 class="h1"><%= t ".title" %></h1>
-<% end %>
-
 <%= decidim_form_for(@form) do |f| %>
   <div class="field">
     <%= f.text_field :name, autofocus: true %>

data/app/views/decidim/system/organizations/index.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>

data/app/views/decidim/system/organizations/new.html.erb

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
@@ -37,9 +35,9 @@
       <table>
         <thead>
           <tr>
-            <th><%= t(".locale") %></th>
-            <th><%= t(".enabled") %> <%= f.error_for(:available_locales) %></th>
-            <th><%= t(".default") %><%= f.error_for(:default_locale) %></th>
+            <td>Locale</td>
+            <td>Enabled <%= f.error_for(:available_locales) %></td>
+            <td>Default? <%= f.error_for(:default_locale) %></td>
           </tr>
         </thead>
         <tbody>

data/app/views/layouts/decidim/system/_login_items.html.erb

@@ -3,6 +3,6 @@
     <%= current_admin.email %>
   </div>
   <div class="sign-out">
-    <%= link_to(t(".logout"), destroy_admin_session_path, :method => :delete) %>
+    <%= link_to("Logout", destroy_admin_session_path, :method => :delete) %>
   </div>
 </div>

data/app/views/layouts/decidim/system/application.html.erb

@@ -1,9 +1,8 @@
-<% add_decidim_page_title("Decidim - System") %>
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= decidim_page_title %></title>
-  <%= render partial: "layouts/decidim/system/header" %>
+<title>Decidim - System</title>
+<%= render partial: "layouts/decidim/system/header" %>
 </head>
 
 <body>

data/app/views/layouts/decidim/system/login.html.erb

@@ -8,7 +8,7 @@
   <body class="login">
     <div class="login-form-wrapper">
       <div class="login-form">
-        <h1><%= t("decidim", scope: "decidim.system.titles") %></h1>
+        <h1>Decidim</h1>
         <%= render "decidim/system/shared/notices" %>
         <div class="login-form-inner">
           <%= yield %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am: