decidim 0.4.4 → 0.5.0

data/decidim-admin/app/views/decidim/admin/scopes/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form) do |f| %>
+<%= decidim_form_for(@form, url: current_scopes_path) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

data/decidim-admin/app/views/decidim/admin/users/_form.html.erb

@@ -5,3 +5,7 @@
 <div class="row column">
   <%= form.email_field :email, label: t('.email') %>
 </div>
+
+<div class="row column">
+  <%= form.select :role, @form.available_roles_for_select, label: t('.role') %>
+</div>

data/decidim-admin/app/views/decidim/admin/users/index.html.erb

@@ -10,6 +10,7 @@
       <table class="table-list">
         <thead>
           <tr>
+            <th><%= t("models.user.fields.role", scope: "decidim.admin") %></th>
             <th><%= t("models.user.fields.name", scope: "decidim.admin") %></th>
             <th><%= t("models.user.fields.email", scope: "decidim.admin") %></th>
             <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
@@ -22,6 +23,7 @@
         <tbody>
           <% @users.each do |user| %>
             <tr data-user-id="<%= user.id %>">
+              <td><%= t(user.active_role, scope: "decidim.admin.models.user.fields.roles") %></td>
               <td><%= user.name %></td>
               <td><%= user.email %></td>
               <td>

data/decidim-admin/app/views/layouts/decidim/admin/newsletters.erb

@@ -11,4 +11,4 @@
 
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>
-<% end %>
+<% end %>

data/decidim-admin/app/views/layouts/decidim/admin/pages.html.erb

@@ -11,4 +11,4 @@
 
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>
-<% end %>
+<% end %>

data/decidim-admin/app/views/layouts/decidim/admin/participatory_process.html.erb

@@ -31,8 +31,8 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Category %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_categories_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_categories_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin.categories_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.categories_path(current_participatory_process) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Attachment %>
@@ -46,8 +46,8 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Moderation %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_moderations_path(current_participatory_process.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_moderations_path(current_participatory_process.id) %>
+        <li <% if is_active_link?(decidim_admin.moderations_path(current_participatory_process.id)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.moderations_path(current_participatory_process.id) %>
         </li>
       <% end %>
     </ul>

data/decidim-admin/app/views/layouts/decidim/admin/participatory_process_groups.html.erb

@@ -11,4 +11,4 @@
 
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>
-<% end %>
+<% end %>

data/decidim-admin/app/views/layouts/decidim/admin/settings.html.erb

@@ -10,10 +10,13 @@
       <li <% if is_active_link?(decidim_admin.scopes_path) %> class="is-active" <% end %>>
         <%= link_to t("menu.scopes", scope: "decidim.admin"), decidim_admin.scopes_path %>
       </li>
+      <li <% if is_active_link?(decidim_admin.scope_types_path) %> class="is-active" <% end %>>
+        <%= link_to t("menu.scope_types", scope: "decidim.admin"), decidim_admin.scope_types_path %>
+      </li>
     </ul>
   </div>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>
-<% end %>
+<% end %>

data/decidim-admin/app/views/layouts/decidim/admin/users.html.erb

@@ -4,14 +4,19 @@
       <%= t ".title" %>
     </div>
     <ul>
-      <li <% if is_active_link?(decidim_admin.users_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.admins", scope: "decidim.admin"), decidim_admin.users_path %>
-      </li>
+      <% if can? :index, Decidim::User %>
+        <li <% if is_active_link?(decidim_admin.users_path) %> class="is-active" <% end %>>
+          <%= link_to t("menu.admins", scope: "decidim.admin"), decidim_admin.users_path %>
+        </li>
+      <% end %>
       <% if can? :index, Decidim::UserGroup %>
         <li <% if is_active_link?(decidim_admin.user_groups_path) %> class="is-active" <% end %>>
           <%= link_to t("menu.user_groups", scope: "decidim.admin"), decidim_admin.user_groups_path %>
         </li>
       <% end %>
+      <li <% if is_active_link?(decidim_admin.managed_users_path) %> class="is-active" <% end %>>
+        <%= link_to t("menu.managed_users", scope: "decidim.admin"), decidim_admin.managed_users_path %>
+      </li>
     </ul>
   </div>
 <% end %>

data/decidim-admin/config/i18n-tasks.yml

@@ -86,7 +86,7 @@ search:
 ignore_missing:
 # - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
 # - '{devise,simple_form}.*'
- - decidim.participatory_processes.scopes.global
+ - decidim.scopes.global
  - locale.name
  - forms.required
 
@@ -95,6 +95,7 @@ ignore_unused:
  - activerecord.attributes.*
  - activemodel.attributes.*
  - decidim.admin.participatory_process_steps.default_title
+ - decidim.admin.models.user.fields.roles.*
  - activemodel.errors.messages.*
  - actions.confirm_destroy
  - time.formats.*

data/decidim-admin/config/locales/ca.yml

@@ -69,8 +69,14 @@ ca:
         name: Nom
         role: Rol
       scope:
+        code: Codi
         name: Nom
         organization: Organització
+        scope_type: Tipus d'àmbit
+      scope_type:
+        name: Nom
+        organization: Organització
+        plural: Plural
       static_page:
         content: Contingut
         organization: Organització
@@ -210,9 +216,43 @@ ca:
         update:
           error: S'ha produït un error en actualitzar aquesta funcionalitat.
           success: La funcionalitat s'ha actualitzat correctament.
+      managed_users:
+        close_session:
+          error: S'ha produït un error en tancar la sessió de suplantació actual.
+          success: La sessió de suplantació actual s'ha finalitzat amb èxit.
+        create:
+          error: S'ha produït un error en crear l'usuari gestionat.
+          success: L'usuari gestionat s'ha creat correctament.
+        form:
+          name: Nom
+        impersonate:
+          error: S'ha produït un error en suplantar l'usuari gestionat.
+        impersonations:
+          new:
+            impersonate: Suplantar
+            new_managed_user_impersonation: Nova suplantació d'usuaris gestionats
+        index:
+          impersonate: Suplantar
+          needs_authoriation_warning: Necessiteu almenys una autorització habilitada per a aquesta organització.
+          promote: Promocionar
+          view_logs: Veure registres
+        new:
+          create: Crear
+          new_managed_user: Nou usuari gestionat
+          select_authorization_method: Seleccioneu un mètode d'autorització
+          step: Fase %{current} de %{total}
+        promotion:
+          error: S'ha produït un error en promoure l'usuari gestionat.
+          success: S'ha promogut amb èxit l'usuari gestionat.
+        promotions:
+          new:
+            explanation: Els usuaris gestionats es poden promocionar a usuaris estàndard. Significa que seran convidats al sistema i no podreu tornar a suplantar-los. L'usuari convidat rebrà un correu electrònic per acceptar la vostra invitació.
+            new_managed_user_promotion: Nova promoció d'usuari gestionat
+            promote: Promocionar
       menu:
         admins: Administradors
         dashboard: Tauler de control
+        managed_users: Usuaris gestionats
         newsletters: Butlletins
         participatory_process_groups: Grups de processos
         participatory_processes: Processos
@@ -224,6 +264,7 @@ ca:
           moderations: Moderacions
           process_admins: Usuaris del procés
           steps: Fases del procés
+        scope_types: Tipus d'àmbit
         scopes: Àmbits
         settings: Configuració
         static_pages: Pàgines
@@ -237,6 +278,15 @@ ca:
           name: Arxiu adjunt
         category:
           name: Categoria
+        impersonation_log:
+          fields:
+            admin: Administrador
+            ended_at: Va acabar el
+            expired_at: Vençut el
+            started_at: Va començar el
+            user: Usuari
+        managed_user:
+          name: Usuari gestionat
         newsletter:
           fields:
             created_at: Data de creació
@@ -273,8 +323,12 @@ ca:
             moderator: Moderador
         scope:
           fields:
-            created_at: Data de creació
             name: Nom
+            scope_type: Tipus d'àmbit
+        scope_type:
+          fields:
+            name: Nom
+            plural: Plural
         static_page:
           fields:
             created_at: Data de creació
@@ -287,6 +341,10 @@ ca:
             invitation_sent_at: Data d'enviament de la invitació
             last_sign_in_at: Darrera data d'identificació
             name: Nom
+            role: Rol
+            roles:
+              admin: Administrador
+              user_manager: Administrador d'usuaris
           name: Usuari
         user_group:
           fields:
@@ -354,7 +412,6 @@ ca:
         new:
           copy: Còpia
           select: Selecciona quines dades voleu duplicar
-          title: Duplicar procés participatiu
       participatory_process_groups:
         destroy:
           success: Grup eliminat correctament.
@@ -445,6 +502,21 @@ ca:
         create:
           error: S'ha produït un error creant aquest grup de processos participatius.
           success: Grup de processos participatius creat correctament.
+      scope_types:
+        create:
+          error: S'ha produït un error en crear un nou tipus d'àmbit.
+          success: Tipus d'àmbit creat amb èxit.
+        destroy:
+          success: Tipus d'àmbit destruït amb èxit
+        edit:
+          title: Editar tipus d'àmbit
+          update: Actualitzar
+        new:
+          create: Crea tipus d'àmbit
+          title: Nou àmbit
+        update:
+          error: S'ha produït un error en actualitzar aquest tipus d'àmbit.
+          success: Tipus d'àmbit actualitzat amb èxit
       scopes:
         create:
           error: S'ha produït un error en crear un nou àmbit.
@@ -457,6 +529,7 @@ ca:
         new:
           create: Crea àmbit
           title: Nou àmbit
+        no_scopes: No hi ha àmbits a aquest nivell.
         update:
           error: S'ha produït un error en l'actualització d'aquest àmbit.
           success: Àmbit actualitzat correctament
@@ -479,8 +552,11 @@ ca:
           success: La pàgina s'ha actualitzat correctament.
       titles:
         dashboard: Tauler de control
+        impersonations: Suplantacions
+        managed_users: Usuaris gestionats
         participatory_process_groups: Grups de processos participatius
         participatory_processes: Processos participatius
+        scope_types: Tipus d'àmbit
         scopes: Àmbits
         static_pages: Pàgines
         user_groups: Grups d'usuaris
@@ -515,6 +591,7 @@ ca:
         form:
           email: Correu electrònic
           name: Nom
+          role: Rol
         new:
           create: Convidar
           title: Convidar un usuari com a administrador
@@ -559,4 +636,4 @@ ca:
   time:
     formats:
       datepicker: "%m/%d/%Y"
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

data/decidim-admin/config/locales/en.yml

@@ -49,6 +49,7 @@ en:
         participatory_structure: Participatory structure
         promoted: Promoted
         scope_id: Scope
+        scopes_enabled: Scopes enabled
         short_description: Short description
         slug: URL slug
         subtitle: Subtitle
@@ -70,8 +71,14 @@ en:
         name: Name
         role: Role
       scope:
+        code: Code
         name: Name
         organization: Organization
+        scope_type: Scope type
+      scope_type:
+        name: Name
+        organization: Organization
+        plural: Plural
       static_page:
         content: Content
         organization: Organization
@@ -116,6 +123,7 @@ en:
       actions:
         activate: Activate
         add: Add
+        browse: Browse
         configure: Configure
         confirm_destroy: Are you sure you want to delete this?
         destroy: Destroy
@@ -211,9 +219,43 @@ en:
         update:
           error: There has been an error updating this feature.
           success: The feature was updated successfully.
+      managed_users:
+        close_session:
+          error: There has been an error closing the current impersonation session.
+          success: The current impersonation session has been successfully ended.
+        create:
+          error: There has been an error creating the managed user.
+          success: The managed user has been successfully created.
+        form:
+          name: Name
+        impersonate:
+          error: There has been an error impersonating the managed user.
+        impersonations:
+          new:
+            impersonate: Impersonate
+            new_managed_user_impersonation: New managed user impersonation
+        index:
+          impersonate: Impersonate
+          needs_authoriation_warning: You need at least one authorization enabled for this organization.
+          promote: Promote
+          view_logs: View logs
+        new:
+          create: Create
+          new_managed_user: New managed user
+          select_authorization_method: Select an authorization method
+          step: Step %{current} of %{total}
+        promotion:
+          error: There has been an error promoting the managed user.
+          success: The managed user has been successfully promoted.
+        promotions:
+          new:
+            explanation: Managed users can be promoted to standard users. It means they will be invited to the application and you will not be able to impersonate them again. The invited user will receive an email to accept your invitation.
+            new_managed_user_promotion: New managed user promotion
+            promote: Promote
       menu:
         admins: Admins
         dashboard: Dashboard
+        managed_users: Managed users
         newsletters: Newsletters
         participatory_process_groups: Process groups
         participatory_processes: Processes
@@ -225,6 +267,7 @@ en:
           moderations: Moderations
           process_admins: Process users
           steps: Steps
+        scope_types: Scope types
         scopes: Scopes
         settings: Settings
         static_pages: Pages
@@ -238,6 +281,15 @@ en:
           name: Attachment
         category:
           name: Category
+        impersonation_log:
+          fields:
+            admin: Admin
+            ended_at: Ended at
+            expired_at: Expired at
+            started_at: Started at
+            user: User
+        managed_user:
+          name: Managed user
         newsletter:
           fields:
             created_at: Created at
@@ -274,8 +326,12 @@ en:
             moderator: Moderator
         scope:
           fields:
-            created_at: Created at
             name: Name
+            scope_type: Scope type
+        scope_type:
+          fields:
+            name: Name
+            plural: Plural
         static_page:
           fields:
             created_at: Created at
@@ -288,6 +344,10 @@ en:
             invitation_sent_at: Invitation sent date
             last_sign_in_at: Last sign in date
             name: Name
+            role: Role
+            roles:
+              admin: Admin
+              user_manager: User manager
           name: User
         user_group:
           fields:
@@ -355,7 +415,7 @@ en:
         new:
           copy: Copy
           select: Select which data you would like to duplicate
-          title: Duplicate participatory processs
+          title: Duplicate participatory process
       participatory_process_groups:
         destroy:
           success: Participatory process group destroyed successfully.
@@ -446,6 +506,21 @@ en:
         create:
           error: There was an error creating a new participatory process group.
           success: Participatory process group created successfully.
+      scope_types:
+        create:
+          error: There was an error creating a new scope type.
+          success: Scope type created successfully.
+        destroy:
+          success: Scope type successfully destroyed
+        edit:
+          title: Edit scope type
+          update: Update
+        new:
+          create: Create scope type
+          title: New scope
+        update:
+          error: There was an error when updating this scope type.
+          success: Scope type updated successfully
       scopes:
         create:
           error: There was an error creating a new scope.
@@ -458,6 +533,7 @@ en:
         new:
           create: Create scope
           title: New scope
+        no_scopes: No scopes at this level.
         update:
           error: There was an error when updating this scope.
           success: Scope updated successfully
@@ -480,8 +556,11 @@ en:
           success: Page updated successfully
       titles:
         dashboard: Dashboard
+        impersonations: Impersonations
+        managed_users: Managed users
         participatory_process_groups: Participatory process groups
         participatory_processes: Participatory processes
+        scope_types: Scope types
         scopes: Scopes
         static_pages: Pages
         user_groups: User groups
@@ -516,6 +595,7 @@ en:
         form:
           email: Email
           name: Name
+          role: Role
         new:
           create: Invite
           title: Invite user as administrator