decidim-system 0.31.4 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1945d6b48f72e942d86b1f51b6b32b2b25052f6a953861a891f6fa1fb56714e6
-  data.tar.gz: 58f2bc5a79edd914b97328d4800c6beac7bb7c77ab179fccb865dba7154d4906
+  metadata.gz: da5cdf4aa1b70b51c9dd6ddfc54b3955b4a6ba33bee1ad89346993527de4b11e
+  data.tar.gz: 8f88aeda85929d086bd2021704dafce5279b9fdb58e4a5654eafa29bcdc4ea30
 SHA512:
-  metadata.gz: 0430ef7bbce0ea11a70bcc205552a50e3cfba6bb740117808d6c2972bec9cbc3f633c6d98e096a6711919828dacd1474335c8933ea2aa893042c26b82b6fa1a8
-  data.tar.gz: 753edc545e2d65e897ab210515f0f7e066c46cec4be1bf18a2f95dc9ac1815e62765d63468a8036dcb4cfca508c96682e29a2cffdd98a9a7e56c12be47b3290f
+  metadata.gz: c2cb0273741a8ec3ad00816daf2ceafb913ff062c50ad373d72e7f8668f2570e538fb22d9fdb716efea44c04b9eb5493a91e92ff1cefeb919849ef44059308e8
+  data.tar.gz: 0ea01b28e31c1241ee54dbf901311de79dfec8df92e23503421790900f00a136f5be6befa0a2f77049d9dfc4d92fafbdbccb57d560256be5006ab7a3989d405d

data/README.md

@@ -1,23 +1,11 @@
-# Decidim::System
+# decidim-system
 
 This engine adds an administration dashboard so admin can manage a Decidim deploy
 and its organizations when working in a multi-tenant environment.
 
 ## Usage
 
-`decidim-system` is already included in the `decidim` gem, but you can also include it separately:
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'decidim-system'
-```
-
-And then execute:
-
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this feature.
 
 ## Multi-tenancy in Decidim
 

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

@@ -24,7 +24,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("admins.create.error", scope: "decidim.system")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -46,7 +46,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("admins.update.error", scope: "decidim.system")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end

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

@@ -29,7 +29,7 @@ module Decidim
         RefreshApiUserSecret.call(api_user, current_admin) do
           on(:ok) do |secret|
             flash[:notice] = I18n.t("api_user.refresh.success", scope: "decidim.system", user: api_user.api_key)
-            session[:api_user] = { id: api_user.id, secret: secret }
+            session[:api_user] = { id: api_user.id, secret: }
             redirect_to action: :index
           end
 
@@ -41,17 +41,17 @@ module Decidim
       end
 
       def create
-        @form = ::Decidim::System::ApiUserForm.from_params(params.merge!(name: params[:admin][:name], organization: organization))
+        @form = ::Decidim::System::ApiUserForm.from_params(params.merge!(name: params[:admin][:name], organization:))
         CreateApiUser.call(@form, current_admin) do
           on(:ok) do |api_user, secret|
             flash[:notice] = I18n.t("api_user.create.success", scope: "decidim.system", user: api_user.api_key)
-            session[:api_user] = { id: api_user.id, secret: secret }
+            session[:api_user] = { id: api_user.id, secret: }
             redirect_to action: :index
           end
 
           on(:invalid) do
             flash[:error] = I18n.t("api_user.create.error", scope: "decidim.system")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/system/devise/sessions_controller.rb

@@ -18,7 +18,7 @@ module Decidim
 
         def redirect_to_referer_or_path
           set_flash_message(:alert, "csrf_token", scope: "devise.failure")
-          redirect_back(fallback_location: root_path)
+          redirect_back_or_to(root_path)
         end
 
         def current_organization; end

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

@@ -30,7 +30,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("oauth_applications.create.error", scope: "decidim.system")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -55,7 +55,7 @@ module Decidim
           on(:invalid) do |application|
             @oauth_application = application
             flash.now[:error] = I18n.t("oauth_applications.update.error", scope: "decidim.system")
-            render action: :edit, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           end
         end
       end

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

@@ -24,12 +24,12 @@ module Decidim
 
           on(:invalid_invitation) do
             flash.now[:alert] = t("organizations.create.error_invitation", scope: "decidim.system")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
 
           on(:invalid) do
             flash.now[:alert] = t("organizations.create.error", scope: "decidim.system")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -55,7 +55,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organizations.update.error", scope: "decidim.system")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end

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

@@ -8,6 +8,7 @@ module Decidim
     #
     class RegisterOrganizationForm < BaseOrganizationForm
       include JsonbAttributes
+
       mimic :organization
 
       attribute :name, String

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

@@ -33,7 +33,7 @@
         <tbody>
           <% localized_locales.each do |locale| %>
             <tr>
-              <td><%= locale.name %></td>
+              <td><%= locale.name %> (<%= locale.id %>)</td>
               <td><%= check_box_tag "organization[available_locales][#{locale.id}]", locale.id, @form.available_locales.include?(locale.id), class: "!m-0" %></td>
               <td><%= radio_button_tag "organization[default_locale]", locale.id, @form.default_locale == locale.id, class: "!m-0" %></td>
             </tr>

data/config/locales/ar.yml

@@ -1,4 +1,3 @@
----
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,4 +1,3 @@
----
 bg:
   activemodel:
     attributes:

data/config/locales/bs-BA.yml

@@ -1,4 +1,3 @@
----
 bs:
   activemodel:
     attributes:

data/config/locales/ca-IT.yml

@@ -1,9 +1,8 @@
----
 ca-IT:
   activemodel:
     attributes:
       oauth_application:
-        name: Nom de l'aplicació OAuth
+        name: Nom de l'aplicació
         organization_logo: Logo de l'organització (quadrat)
         organization_name: Organització
         organization_url: URL de l'organització
@@ -299,7 +298,7 @@ ca-IT:
           organization_admin_email_hint: T'enviarem un correu electrònic a aquesta adreça perquè puguis confirmar-la i configurar la teva contrasenya.
           reference_prefix_hint: El prefix de la referència s'utilitza per identificar de forma única els recursos del conjunt de l'organització.
           secondary_hosts_hint: Introdueix cada un d'ells en una nova línia.
-          short_name_hint: Nom curt que es farà servir per a l'Aplicació Web Progressiva (PWA). Ha de tenir un màxim de 12 caràcters.
+          short_name_hint: Nom curt que es farà servir per a l'Aplicació Web Progressiva. Ha de tenir un màxim de 12 caràcters.
           title: Nova organització
         omniauth_settings:
           decidim:

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activemodel:
     attributes:

data/config/locales/cs.yml

@@ -1,4 +1,3 @@
----
 cs:
   activemodel:
     attributes:

data/config/locales/de.yml

@@ -1,4 +1,3 @@
----
 de:
   activemodel:
     attributes:

data/config/locales/el.yml

@@ -1,4 +1,3 @@
----
 el:
   activemodel:
     attributes:

data/config/locales/eo.yml

@@ -1,4 +1,3 @@
----
 eo:
   activemodel:
     attributes:

data/config/locales/es-MX.yml

@@ -1,4 +1,3 @@
----
 es-MX:
   activemodel:
     attributes:

data/config/locales/es-PY.yml

@@ -1,4 +1,3 @@
----
 es-PY:
   activemodel:
     attributes:

data/config/locales/es.yml

@@ -1,4 +1,3 @@
----
 es:
   activemodel:
     attributes:

data/config/locales/eu.yml

@@ -1,4 +1,3 @@
----
 eu:
   activemodel:
     attributes:

data/config/locales/fa-IR.yml

@@ -1,4 +1,3 @@
----
 fa:
   activemodel:
     attributes:

data/config/locales/fi-plain.yml

@@ -1,4 +1,3 @@
----
 fi-pl:
   activemodel:
     attributes:

data/config/locales/fi.yml

@@ -1,4 +1,3 @@
----
 fi:
   activemodel:
     attributes:

data/config/locales/fr-CA.yml

@@ -1,4 +1,3 @@
----
 fr-CA:
   activemodel:
     attributes:

data/config/locales/fr.yml

@@ -1,4 +1,3 @@
----
 fr:
   activemodel:
     attributes:

data/config/locales/ga-IE.yml

@@ -1,4 +1,3 @@
----
 ga:
   activemodel:
     attributes:

data/config/locales/gl.yml

@@ -1,4 +1,3 @@
----
 gl:
   activemodel:
     attributes:

data/config/locales/hu.yml

@@ -1,4 +1,3 @@
----
 hu:
   activemodel:
     attributes:

data/config/locales/id-ID.yml

@@ -1,4 +1,3 @@
----
 id:
   decidim:
     system:

data/config/locales/is-IS.yml

@@ -1,5 +1,4 @@
----
-is:
+is-IS:
   activemodel:
     attributes:
       organization:

data/config/locales/it.yml

@@ -1,4 +1,3 @@
----
 it:
   activemodel:
     attributes:

data/config/locales/ja.yml

@@ -1,4 +1,3 @@
----
 ja:
   activemodel:
     attributes:

data/config/locales/kaa.yml

@@ -1,4 +1,3 @@
----
 kaa:
   decidim:
     system:

data/config/locales/lb.yml

@@ -1,4 +1,3 @@
----
 lb:
   activemodel:
     attributes:

data/config/locales/lt.yml

@@ -1,4 +1,3 @@
----
 lt:
   activemodel:
     attributes:

data/config/locales/lv.yml

@@ -1,4 +1,3 @@
----
 lv:
   activemodel:
     attributes:

data/config/locales/nl.yml

@@ -1,4 +1,3 @@
----
 nl:
   activemodel:
     attributes:

data/config/locales/no.yml

@@ -1,4 +1,3 @@
----
 "no":
   activemodel:
     attributes:

data/config/locales/pl.yml

@@ -1,4 +1,3 @@
----
 pl:
   activemodel:
     attributes:

data/config/locales/pt-BR.yml

@@ -1,4 +1,3 @@
----
 pt-BR:
   activemodel:
     attributes:

data/config/locales/pt.yml

@@ -1,4 +1,3 @@
----
 pt:
   activemodel:
     attributes:

data/config/locales/ro-RO.yml

@@ -1,4 +1,3 @@
----
 ro:
   activemodel:
     attributes:

data/config/locales/ru.yml

@@ -1,4 +1,3 @@
----
 ru:
   activemodel:
     attributes:

data/config/locales/sk.yml

@@ -1,4 +1,3 @@
----
 sk:
   activemodel:
     attributes:

data/config/locales/sl.yml

@@ -1,4 +1,3 @@
----
 sl:
   activemodel:
     attributes:

data/config/locales/sr-CS.yml

@@ -1,4 +1,3 @@
----
 sr:
   activemodel:
     attributes:

data/config/locales/sv.yml

@@ -1,4 +1,3 @@
----
 sv:
   activemodel:
     attributes:

data/config/locales/tr-TR.yml

@@ -1,4 +1,3 @@
----
 tr:
   activemodel:
     attributes:

data/config/locales/uk.yml

@@ -1,4 +1,3 @@
----
 uk:
   activemodel:
     attributes:

data/config/locales/zh-CN.yml

@@ -1,4 +1,3 @@
----
 zh-CN:
   activemodel:
     attributes:

data/config/locales/zh-TW.yml

@@ -1,4 +1,3 @@
----
 zh-TW:
   activemodel:
     attributes:

data/decidim-system.gemspec

@@ -2,12 +2,9 @@
 
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
-# Maintain your gem's version:
-require "decidim/system/version"
-
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.version = Decidim::System.version
+  version = "0.32.0.rc1"
+  s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0-or-later"
@@ -19,7 +16,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.3.0"
+  s.required_ruby_version = "~> 3.4.0"
 
   s.name = "decidim-system"
   s.summary = "Decidim system administration"
@@ -33,10 +30,10 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "active_link_to", "~> 1.0"
-  s.add_dependency "decidim-core", Decidim::System.version
-  s.add_dependency "devise", "~> 4.7"
+  s.add_dependency "decidim-core", version
+  s.add_dependency "devise", ">= 4.7", "< 6.0"
   s.add_dependency "devise-i18n", "~> 1.2"
   s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
 
-  s.add_development_dependency "decidim-dev", Decidim::System.version
+  s.add_development_dependency "decidim-dev", version
 end

data/lib/decidim/system/menu.rb

@@ -9,7 +9,7 @@ module Decidim
                         I18n.t("menu.dashboard", scope: "decidim.system"),
                         decidim_system.root_path,
                         position: 1,
-                        active: ["decidim/system/dashboard" => :show]
+                        active: [{ "decidim/system/dashboard" => :show }]
           if Decidim.module_installed?(:api)
             menu.add_item :api_credentials,
                           I18n.t("menu.api_credentials", scope: "decidim.system"),

data/lib/decidim/system/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.31.4"
+      "0.32.0.rc1"
     end
   end
 end

data/lib/decidim/system.rb

@@ -9,11 +9,15 @@ module Decidim
   # eye view of the whole system.
   #
   module System
-    include ActiveSupport::Configurable
+    class << self
+      def config = self
 
-    # The length of API secrets generated for API users.
-    config_accessor :api_users_secret_length do
-      ENV.fetch("DECIDIM_SYSTEM_API_USERS_SECRET_LENGTH", 32)
+      def configure
+        yield self
+      end
     end
+
+    # The length of API secrets generated for API users.
+    mattr_accessor :api_users_secret_length, default: ENV.fetch("DECIDIM_SYSTEM_API_USERS_SECRET_LENGTH", 32).to_i
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: decidim-system
 version: !ruby/object:Gem::Version
-  version: 0.31.4
+  version: 0.32.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,28 +31,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.4
+        version: 0.32.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.4
+        version: 0.32.0.rc1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: devise-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +99,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.4
+        version: 0.32.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.4
+        version: 0.32.0.rc1
 description: System administration to create new organization in an installation.
 email:
 - josepjaume@gmail.com
@@ -294,7 +299,6 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -302,15 +306,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Decidim system administration
 test_files: []