decidim-admin 0.11.2 → 0.12.0.pre

data/app/views/decidim/admin/newsletters/show.html.erb

@@ -13,7 +13,7 @@
   </div>
 </div>
 <div class="button--double form-general-submit">
-  <% if can?(:update, @newsletter) && !@newsletter.sent? %>
+  <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) && !@newsletter.sent? %>
     <%= link_to t("actions.edit", scope: "decidim.admin"), ["edit", @newsletter], class: "button" %>
   <% end %>
   <% unless @newsletter.sent? %>

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

@@ -2,7 +2,9 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t ".title" %>
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.oauth_application.name", scope: "decidim.admin").downcase), ["new", "oauth_application"], class: "button tiny button--title new" %>
+      <% if allowed_to?(:create, :oauth_application) %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.oauth_application.name", scope: "decidim.admin").downcase), ["new", "oauth_application"], class: "button tiny button--title new" %>
+      <% end %>
     </h2>
   </div>
   <div class="card-section">
@@ -21,11 +23,11 @@
               <td><%= link_to oauth_application.name, decidim_admin.oauth_application_path(oauth_application) %></td>
               <td><%= l oauth_application.created_at, format: :long %></td>
               <td class="table-list__actions">
-                <% if can?(:update, oauth_application) %>
+                <% if allowed_to?(:update, :oauth_application, oauth_application: oauth_application) %>
                   <%= icon_link_to "pencil", decidim_admin.edit_oauth_application_path(oauth_application), t("actions.edit", scope: "decidim.admin"), class: "edit" %>
                 <% end %>
 
-                <% if can?(:destroy, oauth_application) %>
+                <% if allowed_to?(:destroy, :oauth_application, oauth_application: oauth_application) %>
                   <%= icon_link_to "circle-x", decidim_admin.oauth_application_path(oauth_application), t("actions.destroy", scope: "decidim.admin"), method: :delete, data: { confirm: t(".confirm_delete") }, class: "action-icon--remove" %>
                 <% end %>
               </td>

data/app/views/decidim/admin/participatory_space_private_users/index.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t(".title") %>
-      <% if can? :create, authorization_object %>
+      <% if allowed_to? :create, :space_private_user %>
          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_space_private_user.name", scope: "decidim.admin")), url_for(action: :new), class: "button tiny button--title new" %>
       <% end %>
     </h2>
@@ -41,11 +41,11 @@
                   <% end %>
                 </td>
                 <td class="table-list__actions">
-                  <% if can?(:invite, private_user) && private_user.user.invited_to_sign_up? %>
+                  <% if allowed_to?(:invite, :space_private_user, private_user: private_user) && private_user.user.invited_to_sign_up? %>
                     <%= icon_link_to "reload", resend_invitation_participatory_space_private_user_path(current_participatory_space, private_user), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
                   <% end %>
 
-                  <% if can? :destroy, private_user %>
+                  <% if allowed_to? :destroy, :space_private_user, private_user: private_user %>
                     <%= icon_link_to "circle-x", participatory_space_private_user_path(current_participatory_space, private_user), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                   <% end %>
                 </td>

data/app/views/decidim/admin/scope_types/index.html.erb

@@ -1,6 +1,8 @@
 <div class="card">
   <div class="card-divider">
-    <h2 class="card-title"><%= t "decidim.admin.titles.scope_types" %> <%= link_to t("actions.add", scope: "decidim.admin"), ["new", "scope_type"], class: "button tiny button--title" %></h2>
+    <% if allowed_to? :creste, :scope_type %>
+      <h2 class="card-title"><%= t "decidim.admin.titles.scope_types" %> <%= link_to t("actions.add", scope: "decidim.admin"), ["new", "scope_type"], class: "button tiny button--title" %></h2>
+    <% end %>
   </div>
   <div class="card-section">
     <div class="table-scroll">
@@ -23,11 +25,11 @@
               </td>
               <td class="table-list__actions">
 
-                <% if can? :update, scope_type %>
+                <% if allowed_to? :update, :scope_type, scope_type: scope_type %>
                   <%= icon_link_to "pencil", ["edit", scope_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
                 <% end %>
 
-                <% if can? :destroy, scope_type %>
+                <% if allowed_to? :destroy, :scope_type, scope_type: scope_type %>
                   <%= icon_link_to "circle-x", scope_type, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                 <% end %>
               </td>

data/app/views/decidim/admin/scopes/index.html.erb

@@ -2,9 +2,9 @@
   <div class="card-divider">
     <h2 class="card-title">
       <% if parent_scope %>
-        <%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button tiny button--title" %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button tiny button--title" %>
+        <%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button tiny button--title" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button tiny button--title" if allowed_to? :edit, :scope, scope: parent_scope %>
       <% else %>
-        <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button tiny button--title" %>
+        <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button tiny button--title" if allowed_to? :create, :scope %>
       <% end %>
     </h2>
   </div>
@@ -31,11 +31,11 @@
               <td class="table-list__actions">
                 <%= icon_link_to "zoom-in", scope_scopes_path(scope), t("actions.browse", scope: "decidim.admin"), class: "action-icon--browse", method: :get, data: {} %>
 
-                <% if can? :update, scope %>
+                <% if allowed_to? :update, :scope, scope: scope %>
                   <%= icon_link_to "pencil", ["edit", scope], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
                 <% end %>
 
-                <% if can? :destroy, scope %>
+                <% if allowed_to? :destroy, :scope, scope: scope %>
                   <%= icon_link_to "circle-x", scope, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                 <% end %>
               </td>

data/app/views/decidim/admin/static_pages/_form.html.erb

@@ -2,7 +2,7 @@
   <%= form.translated :text_field, :title, autofocus: true %>
 </div>
 
-<% if can? :update_slug, form.object %>
+<% if allowed_to? :update_slug, :static_page, static_page: form.object %>
   <div class="row column">
     <%= form.text_field :slug %>
   </div>
@@ -11,3 +11,5 @@
 <div class="row column">
   <%= form.translated :editor, :content, toolbar: :full, lines: 25 %>
 </div>
+
+<%= render partial: "form_notable_changes", locals: { form: form } %>

data/app/views/decidim/admin/static_pages/_form_notable_changes.html.erb

@@ -0,0 +1,9 @@
+<% if allowed_to? :update_notable_changes, :static_page, static_page: form.object %>
+  <div class="row column">
+    <%= form.check_box :changed_notably, value: false, help_text: t("changed_notably_help", scope: "decidim.admin.static_pages.edit") %>
+
+    <div class="callout secondary">
+      <%= t("last_notable_change", scope: "decidim.admin.static_pages.index") %>: <%= @tos_version_formatted %>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/admin/static_pages/index.html.erb

@@ -1,6 +1,8 @@
 <div class="card">
   <div class="card-divider">
-    <h2 class="card-title"><%= t "decidim.admin.titles.static_pages" %> <%= link_to t("static_pages.new.create", scope: "decidim.admin"), ["new", "static_page"], class: "button tiny button--title new" %></h2>
+    <% if allowed_to? :create, :static_page %>
+      <h2 class="card-title"><%= t "decidim.admin.titles.static_pages" %> <%= link_to t("static_pages.new.create", scope: "decidim.admin"), ["new", "static_page"], class: "button tiny button--title new" %></h2>
+    <% end %>
   </div>
   <div class="card-section">
     <div class="table-scroll">
@@ -9,6 +11,7 @@
           <tr>
             <th><%= t("models.static_page.fields.title", scope: "decidim.admin") %></th>
             <th><%= t("models.static_page.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= t("last_notable_change", scope: "decidim.admin.static_pages.index") %></th>
             <th></th>
           </tr>
         </thead>
@@ -21,14 +24,19 @@
               <td>
                 <%= l page.created_at, format: :short %>
               </td>
+              <td>
+                <% if allowed_to? :update_notable_changes, :static_page, static_page: page %>
+                  <%= @tos_version_formatted %>
+                <% end %>
+              </td>
               <td class="table-list__actions">
-                <% if can? :update, page %>
+                <% if allowed_to? :update, :static_page, static_page: page %>
                   <%= icon_link_to "pencil", ["edit", page], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                 <% end %>
 
                 <%= icon_link_to "eye", decidim.page_path(page), t("actions.view", scope: "decidim.admin.static_pages"), class: "action-icon--preview" %>
 
-                <% if can? :destroy, page %>
+                <% if allowed_to? :destroy, :static_page, static_page: page %>
                   <%= icon_link_to "circle-x", page, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                 <% end %>
               </td>

data/app/views/decidim/admin/static_pages/show.html.erb

@@ -4,11 +4,11 @@
 
 <div class="actions">
   <hr />
-  <% if can? :update, @page %>
+  <% if allowed_to? :update, :static_page, static_page: @page %>
     <%= link_to t("decidim.admin.actions.edit"), ["edit", @page] %>
   <% end %>
 
-  <% if can? :destroy, @page %>
+  <% if allowed_to? :destroy, :static_page, static_page: @page %>
     <%= link_to t("decidim.admin.actions.destroy"), @page, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
   <% end %>
 </div>

data/app/views/decidim/admin/user_groups/index.html.erb

@@ -74,7 +74,7 @@
               <% end %>
               </td>
               <td class="table-list__actions">
-                <% if can?(:verify, user_group) %>
+                <% if allowed_to?(:verify, :user_group, user_group: user_group) %>
                   <% if !user_group.verified? %>
                     <%= icon_link_to "circle-check", decidim_admin.verify_user_group_path(user_group), t("actions.verify", scope: "decidim.admin"), method: :put, class: "action-icon--verify" %>
                   <% else %>
@@ -82,7 +82,7 @@
                   <% end %>
                 <% end %>
 
-                <% if can?(:reject, user_group) %>
+                <% if allowed_to?(:reject, :user_group, user_group: user_group) %>
                   <% if !user_group.rejected? %>
                     <%= icon_link_to "circle-x", decidim_admin.reject_user_group_path(user_group), t("actions.reject", scope: "decidim.admin"), method: :put, class: "action-icon--reject" %>
                   <% else %>

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

@@ -2,7 +2,9 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.users" %>
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.user.name", scope: "decidim.admin")), ["new", "user"], class: "button tiny button--title" %>
+      <% if allowed_to? :create, :admin_user %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.user.name", scope: "decidim.admin")), ["new", "user"], class: "button tiny button--title" %>
+      <% end %>
     </h2>
   </div>
   <div class="card-section">
@@ -43,11 +45,11 @@
               </td>
               <td><%= l user.created_at, format: :short %></td>
               <td class="table-list__actions">
-                <% if can?(:invite, user) && user.invited_to_sign_up? %>
+                <% if allowed_to?(:invite, :admin_user, user: user) && user.invited_to_sign_up? %>
                   <%= icon_link_to "reload", ["resend_invitation", user], t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
                 <% end %>
 
-                <% if can? :destroy, user %>
+                <% if allowed_to? :destroy, :admin_user, user: user %>
                   <%= icon_link_to "circle-x", user, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                 <% end %>
               </td>

data/app/views/layouts/decidim/admin/_application.html.erb

@@ -18,7 +18,6 @@
       <%= yield :secondary_nav if content_for? :secondary_nav %>
     </div>
     <div class="layout-content">
-      <%= render partial: "layouts/decidim/admin/callouts_full" %>
       <div class="container">
         <%= yield %>
       </div>

data/app/views/layouts/decidim/admin/_template_top.html.erb

@@ -1,3 +1,4 @@
 <%= render partial: "layouts/decidim/admin/title_bar" %>
+<%= render partial: "layouts/decidim/admin/callouts_full" %>
 <main class="main">
   <div class="layout-wrapper">

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

@@ -4,22 +4,22 @@
       <%= t ".title" %>
     </div>
     <ul>
-      <% if can? :index, Decidim::User %>
+      <% if allowed_to? :read, :admin_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 %>
+      <% if allowed_to? :index, :user_group %>
         <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 %>
-      <% if can? :index, :officializations %>
+      <% if allowed_to? :index, :officialization %>
         <li <% if is_active_link?(decidim_admin.officializations_path) %> class="is-active" <% end %>>
           <%= link_to t("menu.officializations", scope: "decidim.admin"), decidim_admin.officializations_path %>
         </li>
       <% end %>
-      <% if can? :index, :impersonatable_users %>
+      <% if allowed_to? :index, :impersonatable_user %>
         <li <% if is_active_link?(decidim_admin.impersonatable_users_path) %> class="is-active" <% end %>>
           <%= link_to t("menu.impersonations", scope: "decidim.admin"), decidim_admin.impersonatable_users_path %>
         </li>

data/config/locales/ca.yml

@@ -64,6 +64,7 @@ ca:
         omnipresent_banner_url: URL
         reference_prefix: Prefix de referència
         show_statistics: Mostra estadístiques
+        tos_version: Versió del Termes de Servei
         twitter_handler: Nom d'usuari de Twitter
         welcome_text: Text de benvinguda
         youtube_handler: Nom d'usuari de YouTube
@@ -79,6 +80,7 @@ ca:
         organization: Organització
         plural: Plural
       static_page:
+        changed_notably: S'han produït canvis notables.
         content: Contingut
         organization: Organització
         slug: Nom curt d'URL
@@ -210,6 +212,9 @@ ca:
         update:
           error: S'ha produït un error en actualitzar aquest arxiu adjunt.
           success: Adjunt actualitzat correctament.
+      autocomplete:
+        no_results: No s'ha trobat resultats
+        search_prompt: Escriu com a mínim tres caràcters per cercar
       categories:
         create:
           error: S'ha produït un error en crear aquesta categoria.
@@ -571,8 +576,11 @@ ca:
         destroy:
           success: La pàgina s'ha eliminat correctament.
         edit:
+          changed_notably_help: Si està marcada, els usuaris seran notificats per acceptar els nous termes i condicions.
           title: Editar pàgina
           update: Actualitzar
+        index:
+          last_notable_change: Últims canvis notables
         new:
           create: Crea
           title: Nova pàgina

data/config/locales/en.yml

@@ -65,6 +65,7 @@ en:
         omnipresent_banner_url: URL
         reference_prefix: Reference prefix
         show_statistics: Show statistics
+        tos_version: Terms of service version
         twitter_handler: Twitter handler
         welcome_text: Welcome text
         youtube_handler: YouTube handler
@@ -80,6 +81,7 @@ en:
         organization: Organization
         plural: Plural
       static_page:
+        changed_notably: There have been noticeable changes.
         content: Content
         organization: Organization
         slug: URL slug
@@ -211,6 +213,9 @@ en:
         update:
           error: There was an error when updating this attachment.
           success: Attachment updated successfully.
+      autocomplete:
+        no_results: No results found
+        search_prompt: Type at least three characters to search
       categories:
         create:
           error: There was an error creating this category.
@@ -572,8 +577,11 @@ en:
         destroy:
           success: Page successfully destroyed
         edit:
+          changed_notably_help: If checked, users will be notified to accept the new terms and conditions.
           title: Edit page
           update: Update
+        index:
+          last_notable_change: Last notable change
         new:
           create: Create
           title: New page

data/config/locales/es.yml

@@ -64,6 +64,7 @@ es:
         omnipresent_banner_url: URL
         reference_prefix: Prefijo de la referencia
         show_statistics: Mostrar estadísticas
+        tos_version: Versión de los Términos de Servicio
         twitter_handler: Nombre de Twitter
         welcome_text: Texto de bienvenida
         youtube_handler: Nombre de YouTube
@@ -79,6 +80,7 @@ es:
         organization: Organización
         plural: Plural
       static_page:
+        changed_notably: Ha habido cambios notables.
         content: Contenido
         organization: Organización
         slug: Texto corto de URL
@@ -210,6 +212,9 @@ es:
         update:
           error: Se ha producido un error al actualizar este archivo adjunto.
           success: Adjunto actualizado correctamente.
+      autocomplete:
+        no_results: No se han encontrado resultados
+        search_prompt: Escriba al menos tres caracteres para buscar
       categories:
         create:
           error: Se ha producido un error al crear esta categoría.
@@ -571,8 +576,11 @@ es:
         destroy:
           success: La página se ha eliminado correctamente.
         edit:
+          changed_notably_help: Si se marca, se notificará a los usuarios que acepten los nuevos Términos y Condiciones.
           title: Editar página
           update: Actualizar
+        index:
+          last_notable_change: Último cambio notable
         new:
           create: Crear
           title: Nueva página

data/config/locales/eu.yml

@@ -64,6 +64,7 @@ eu:
         omnipresent_banner_url: URL
         reference_prefix: Erreferentzia-aurrizkia
         show_statistics: Erakutsi estatistikak
+        tos_version: Zerbitzu-baldintzak bertsioa
         twitter_handler: Twitter kudeatzailea
         welcome_text: Ongietorri testua
         youtube_handler: YouTube kudeatzailea
@@ -79,6 +80,7 @@ eu:
         organization: Erakundea
         plural: Anitza
       static_page:
+        changed_notably: Aldaketa nabarmenak izan dira.
         content: Edukia
         organization: Erakundea
         slug: URL laburra
@@ -210,6 +212,9 @@ eu:
         update:
           error: Errorea gertatu da fitxategi erantsi bat eguneratzean.
           success: Fitxategi erantsia zuzen eguneratu da.
+      autocomplete:
+        no_results: Ez da emaitzarik aurkitu
+        search_prompt: Idatzi bilaketak gutxienez hiru karaktere
       categories:
         create:
           error: Errorea gertatu da kategoria hau sortzean.
@@ -571,8 +576,11 @@ eu:
         destroy:
           success: Orria zuzen ezabatu da.
         edit:
+          changed_notably_help: Egiaztatuta badago, erabiltzaileei jakinaraziko zaie baldintza eta baldintza berriak onartzeko.
           title: Editatu orria
           update: Eguneratu
+        index:
+          last_notable_change: Azken aldaketa nabaria
         new:
           create: Sortu
           title: Orri berria

data/config/locales/fi.yml

@@ -64,6 +64,7 @@ fi:
         omnipresent_banner_url: URL-
         reference_prefix: Viitteen etuliite
         show_statistics: Näytä tilastot
+        tos_version: Käyttöehdot versio
         twitter_handler: Twitter käsittelijä
         welcome_text: Tervetulotoivotus
         youtube_handler: YouTube-käsittelijä
@@ -79,6 +80,7 @@ fi:
         organization: Organisaatio
         plural: Monikko
       static_page:
+        changed_notably: On tapahtunut huomattavia muutoksia.
         content: Sisältö
         organization: Organisaatio
         slug: URL-tunniste
@@ -210,6 +212,9 @@ fi:
         update:
           error: Tämän liitteen päivityksessä tapahtui virhe.
           success: Liite luotu onnistuneesti.
+      autocomplete:
+        no_results: Ei tuloksia
+        search_prompt: Kirjoita vähintään kolme merkkiä etsimään
       categories:
         create:
           error: Tämän aihepiirin luonnissa tapahtui virhe.
@@ -571,8 +576,11 @@ fi:
         destroy:
           success: Sivu tuhottu onnistuneesti
         edit:
+          changed_notably_help: Jos tarkistat, käyttäjät ilmoitetaan hyväksymään uudet ehdot.
           title: Muokkaa sivua
           update: Päivitä
+        index:
+          last_notable_change: Viimeinen huomattava muutos
         new:
           create: Luo
           title: Uusi sivu