decidim-admin 0.24.0.rc2 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac801038223ae48c24054e1bb4ab4a35ca6891b815d792f2a261c2682f2064f6
-  data.tar.gz: 4bf99d9f294a250851f6bc96f8378d5c47d683c574dbc153bb262f1c088cf3b1
+  metadata.gz: fb555dc87d8887f799a876b52770a8040c27de7bbcbd8576f7224b0d99195775
+  data.tar.gz: b7f5ef06d59e89fd49a983581a5df6b934d11639182153b37c05ee955bd3f001
 SHA512:
-  metadata.gz: 552ef284478d6c3c8ce06e7aa6fd66274ebd03639d19f2c7438edb2400ead6869f2b8fe6280598ee779f24e29ce60c5253b9b590cbe4dea782b0e72a51d0590e
-  data.tar.gz: 715884f1d71f3eea36581b52ae11d863092b8c2ada7460ea077e306d674272657951844010e89fb1afb4b6049fbeb1df1ec09654abacf4b1aaade5c5d6dc6fed
+  metadata.gz: 0a65449c96cc837c606fb1593da1a77023a8b1480946e8fbc7bba27193b4316bd858ee4d6a4967f7b13fabe1b2927c48d006b66cd1f9a1e0b20068e243459de7
+  data.tar.gz: 2739efc9276d7506ac9f958af7a0a09313fafee07638c38d4e91f8627159fce1e6716137ab03dc782c1f9241057c49fb0db0503d9d166554c7d1056c191b2a0b

data/app/assets/javascripts/decidim/admin/application.js.es6

@@ -18,7 +18,7 @@
 // = require ./bundle
 // = require ./draggable-list
 // = require ./sortable
-// = require ./gallery
+// = require decidim/gallery
 // = require ./moderations
 // = require decidim/input_tags
 // = require decidim/input_hashtags

data/app/controllers/concerns/decidim/admin/global_moderation_context.rb

@@ -15,9 +15,8 @@ module Decidim
         end
 
         # Private: Finds the participatory spaces the current user is admin to.
-        # This is only used for users that are "participatoy space admins", not
-        # organization-wide admins. This method will later be used to find out
-        # what moderations can the current user manage.
+        # This method will later be used to find out what moderations the
+        # current user can manage.
         #
         # Returns an Array.
         def spaces_user_is_admin_to
@@ -27,7 +26,8 @@ module Decidim
                 .find_participatory_space_manifest(manifest.name)
                 .participatory_spaces
                 .call(current_organization)&.select do |space|
-                  space.moderators.exists?(id: current_user.id)
+                  space.moderators.exists?(id: current_user.id) ||
+                    space.admins.exists?(id: current_user.id)
                 end
             end
         end
@@ -39,11 +39,7 @@ module Decidim
         # Returns an `ActiveRecord::Relation`
         def moderations_for_user
           @moderations_for_user ||=
-            if current_user.admin?
-              Decidim::Moderation.all
-            else
-              Decidim::Moderation.where(participatory_space: spaces_user_is_admin_to)
-            end
+            Decidim::Moderation.where(participatory_space: spaces_user_is_admin_to)
         end
       end
     end

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

@@ -33,6 +33,7 @@
         </thead>
         <tbody>
           <% moderations.each do |moderation| %>
+            <% next unless moderation.reportable %>
             <tr data-id="<%= moderation.id %>">
               <td><%= moderation.reportable.id %></td>
               <td>

data/config/locales/gl.yml

@@ -31,6 +31,7 @@ gl:
         subject: Asunto
       organization:
         alert_color: Alerta
+        available_authorizations: Autorizacións dispoñíbeis
         badges_enabled: Activar emblemas
         comments_max_length: Lonxitude máxima dos comentarios (0 para valor predefinido)
         cta_button_path: Camiño do botón de chamada a acción
@@ -41,6 +42,8 @@ gl:
         enable_omnipresent_banner: Mostrar o banner omnipresente
         facebook_handler: Administrador de Facebook
         favicon: Ícona
+        force_authentication: Forzar autenticación
+        force_users_to_authenticate_before_access_organization: Forzar aos usuarios a se autenticar antes de acceder á organización
         from: Correo electrónico do remitente
         github_handler: Xestor de GitHub
         header_snippets: Fragmentos de cabeceira
@@ -53,6 +56,7 @@ gl:
         highlighted_content_banner_image: Imaxe
         highlighted_content_banner_short_description: Descrición curta
         highlighted_content_banner_title: Título
+        host: Host
         instagram_handler: Administrador de Instagram
         logo: Logo
         machine_translation_display_priority: Prioridade ao amosar as traducións automáticas
@@ -69,6 +73,7 @@ gl:
         reference_prefix: Prefijo de referencia
         rich_text_editor_in_public_views: Habilitar o editor de texto avanzado para os participantes
         secondary_color: Secundaria
+        secondary_hosts: Hosts secundarios
         send_welcome_notification: Enviar notificación de benvida
         success_color: Éxito
         time_zone: Fuso horario
@@ -116,6 +121,10 @@ gl:
               allowed_file_content_types: Ficheiro de imaxe non válido
             official_img_header:
               allowed_file_content_types: Ficheiro de imaxe non válido
+      new_import:
+        attributes:
+          file:
+            invalid_mime_type: Tipo Mime non válido
   activerecord:
     attributes:
       decidim/static_page:
@@ -142,6 +151,7 @@ gl:
         category:
           new: Nova categoría
         export: Exportar
+        import: Importar
         manage: Xestionar
         new: Novo %{name}
         newsletter:
@@ -300,6 +310,7 @@ gl:
           success: O compoñente foi actualizado correctamente.
       conflicts:
         'false': 'Non'
+        managed_user_name: Usuario xestionado
         solved: Resolto
         title: Conflitos de verificación
         transfer:
@@ -352,6 +363,11 @@ gl:
           title_cont: Procurar %{collection} por título.
         state_eq:
           label: Estado
+      forms:
+        file_help:
+          import:
+            message_1: Están soportados os ficheiros CSV, JSON e Excel (.xls)
+            message_2: Para os ficheiros CSV, o separador entre columnas ten de ser o punto e coa (";")
       help_sections:
         error: Produciuse un erro ao actualizar as seccións de axuda
         form:
@@ -390,6 +406,20 @@ gl:
           impersonate_existing_managed_user: Substituír o usuario xestionado "%{name}"
           impersonate_existing_user: Substitúe o usuario "%{name}"
           impersonate_new_managed_user: Substituír o novo usuario xestor
+      imports:
+        error: Produciuse un problema durante a importación
+        help:
+          proposalcreator: O ficheiro ten de incluír os nomes de columna title/en e body/en (ou outro idioma da túa preferencia, por exemplo title/gl e body/gl). Admítense tamén as columnas scope/id e category/id.
+        import_from_file: Importar dende o ficheiro
+        new:
+          accepted_mime_types:
+            csv: csv
+            json: json
+            xls: xls
+          actions:
+            back: Volver
+          import: Importar
+        notice: "%{number}%{resource_name} importados con éxito"
       logs:
         logs_list:
           no_logs_yet: Aínda non hai rexistros
@@ -477,6 +507,7 @@ gl:
             created_at: Creado o
             expires_at: Caduca o
             last_used_at: Empregado por última vez
+            times_used: Veces utilizado
             token: Token
             user: Creado por
         static_page:
@@ -506,10 +537,13 @@ gl:
       moderated_users:
         index:
           actions:
+            block: Bloquear usuario
             title: Accións
+            unblock: Desbloquear usuario
           name: Nome
           nickname: Alcume
           reason: Motivo
+          title: Listando os usuarios reportados
         report:
           reasons:
             offensive: Ofensivo
@@ -744,7 +778,11 @@ gl:
           confirm_destroy: Estás certo/a de querer eliminar este token?
           destroy: Eliminar
           share: Compartir
+        destroy:
+          error: Produciuse un problema ao destruír o token.
         share_tokens:
+          empty: Non hai tokens activos
+          help: Estes tokens empréganse para compartir publicamente con calquera usuario este recurso non publicado. Ocultaranse cando o recurso sexa publicado. Preme na icona de compartir token para visitar o URL compartíbel.
           title: Compartir tokens
       shared:
         gallery:

data/lib/decidim/admin/test/manage_moderations_examples.rb

@@ -24,6 +24,16 @@ shared_examples "manage moderations" do
   end
 
   context "when listing moderations" do
+    it "only lists moderations for the current organization" do
+      external_reportable = create :dummy_resource
+      external_moderation = create(:moderation, reportable: external_reportable, report_count: 1, reported_content: external_reportable.reported_searchable_content_text)
+      create(:report, moderation: external_moderation)
+
+      visit current_path
+
+      expect(page).to have_no_selector("tr[data-id=\"#{external_moderation.id}\"]")
+    end
+
     it "user can review them" do
       moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
@@ -91,6 +101,15 @@ shared_examples "manage moderations" do
       reported_content_slice = moderation.reportable.reported_searchable_content_text.split("\n").first
       expect(page).to have_content(reported_content_slice)
     end
+
+    context "when the reported content does not exist" do
+      it "still renders the page" do
+        moderation.reportable.destroy
+        visit current_path
+
+        expect(page).to have_no_selector("tr[data-id=\"#{moderation.id}\"]")
+      end
+    end
   end
 
   context "when listing hidden resources" do

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.24.0.rc2"
+      "0.24.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.24.0.rc2
+  version: 0.24.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -130,28 +130,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -175,7 +175,6 @@ files:
 - app/assets/javascripts/decidim/admin/dynamic_fields.component.js.es6
 - app/assets/javascripts/decidim/admin/field_dependent_inputs.component.js.es6
 - app/assets/javascripts/decidim/admin/form.js.es6
-- app/assets/javascripts/decidim/admin/gallery.js.es6
 - app/assets/javascripts/decidim/admin/import_guidance.js.es6
 - app/assets/javascripts/decidim/admin/managed_users.js.es6
 - app/assets/javascripts/decidim/admin/moderations.js.es6
@@ -732,9 +731,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key:

data/app/assets/javascripts/decidim/admin/gallery.js.es6

@@ -1,5 +0,0 @@
-$(() => {
-  $(".gallery__container").on("closed.zf.callout", (event) => {
-    $(event.target).remove();
-  });
-});