decidim-assemblies 0.31.3 → 0.32.0.rc1

data/app/permissions/decidim/assemblies/permissions.rb

@@ -41,7 +41,7 @@ module Decidim
 
         return permission_action unless assembly
 
-        user_can_read_private_users?
+        user_can_read_members?
 
         moderator_action?
         collaborator_action?
@@ -53,9 +53,9 @@ module Decidim
 
       private
 
-      def user_can_read_private_users?
-        return unless permission_action.subject == :space_private_user
-        return unless assembly.private_space?
+      def user_can_read_members?
+        return unless permission_action.subject == :space_member
+        return unless assembly.has_members?
 
         toggle_allow(user.admin? || can_manage_assembly?(role: :admin) || can_manage_assembly?(role: :collaborator))
       end
@@ -108,7 +108,7 @@ module Decidim
                       [:assembly, :participatory_space].include?(permission_action.subject) &&
                       assembly
 
-        return disallow! unless can_view_private_space?
+        return disallow! unless can_view_restricted_space?
         return allow! if user&.admin?
         return allow! if assembly.published?
         return allow! if user_can_preview_space?
@@ -116,11 +116,11 @@ module Decidim
         toggle_allow(can_manage_assembly?)
       end
 
-      def can_view_private_space?
-        return true unless assembly.private_space && !assembly.is_transparent?
+      def can_view_restricted_space?
+        return true unless assembly.restricted?
         return false unless user
 
-        user.admin || assembly.users.include?(user)
+        user.admin? || assembly.users.include?(user)
       end
 
       def public_list_members_action?
@@ -222,7 +222,7 @@ module Decidim
       # Collaborators can read/preview everything inside their assembly.
       def collaborator_action?
         return unless can_manage_assembly?(role: :collaborator)
-        return if permission_action.subject == :space_private_user
+        return if permission_action.subject == :space_member
 
         allow! if permission_action.action == :read || permission_action.action == :preview
       end

data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb

@@ -35,7 +35,6 @@ module Decidim
             target: :i18n,
             title: :i18n,
             purpose_of_action: :i18n,
-            decidim_assemblies_type_id: :assembly_type,
             creation_date: :date,
             created_by: :string,
             created_by_other: :i18n,
@@ -44,7 +43,7 @@ module Decidim
             closing_date: :date,
             closing_date_reason: :i18n,
             internal_organisation: :i18n,
-            is_transparent: :boolean,
+            access_mode: :access_mode,
             special_features: :i18n,
             twitter_handler: :string,
             facebook_handler: :string,

data/app/presenters/decidim/assemblies/assembly_presenter.rb

@@ -9,10 +9,6 @@ module Decidim
         assembly.attached_uploader(:hero_image).url
       end
 
-      def banner_image_url
-        assembly.attached_uploader(:banner_image).url
-      end
-
       def area_name
         return if assembly.area.blank?
 

data/app/queries/decidim/assemblies/admin/admin_users.rb

@@ -42,7 +42,7 @@ module Decidim
         def assemblies_user_admins
           Decidim::User.where(
             id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
-                                         .select(:decidim_user_id)
+                .select(:decidim_user_id)
           )
         end
 

data/app/serializers/decidim/assemblies/assembly_importer.rb

@@ -38,7 +38,6 @@ module Decidim
             target: attributes["target"],
             participatory_scope: attributes["participatory_scope"],
             participatory_structure: attributes["participatory_structure"],
-            private_space: attributes["private_space"],
             reference: attributes["reference"],
             purpose_of_action: attributes["purpose_of_action"],
             composition: attributes["composition"],
@@ -49,7 +48,6 @@ module Decidim
             closing_date: attributes["closing_date"],
             created_by_other: attributes["created_by_other"],
             internal_organisation: attributes["internal_organisation"],
-            is_transparent: attributes["is_transparent"],
             special_features: attributes["special_features"],
             twitter_handler: attributes["twitter_handler"],
             instagram_handler: attributes["instagram_handler"],
@@ -58,11 +56,9 @@ module Decidim
             github_handler: attributes["github_handler"],
             created_by: attributes["created_by"],
             meta_scope: attributes["meta_scope"],
-            announcement: attributes["announcement"]
+            access_mode: resolve_access_mode(attributes)
           )
           import_hero_image(attributes["remote_hero_image_url"])
-          import_banner_image(attributes["remote_banner_image_url"])
-
           @imported_assembly.save!
           @imported_assembly
         end
@@ -178,14 +174,6 @@ module Decidim
         @warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
       end
 
-      def import_banner_image(url)
-        return if url.blank?
-
-        @imported_assembly.attached_uploader(:banner_image).remote_url = url
-      rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
-        @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
-      end
-
       def format_error(error)
         return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
 
@@ -197,6 +185,15 @@ module Decidim
         message = message.presence || error.message
         "#{code} #{message}"
       end
+
+      def resolve_access_mode(attributes)
+        return attributes["access_mode"] if attributes["access_mode"].present?
+
+        return "transparent" if attributes["is_transparent"] == true
+        return "restricted" if attributes["private_space"] == true
+
+        "open"
+      end
     end
   end
 end

data/app/serializers/decidim/assemblies/assembly_serializer.rb

@@ -14,7 +14,7 @@ module Decidim
               attachment_collections: serialize_attachment_collections,
               files: serialize_attachments
             },
-            private_space: resource.private_space,
+            access_mode: resource.access_mode,
             weight: resource.weight,
             components: serialize_components
           }

data/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb

@@ -12,8 +12,6 @@ module Decidim
             url: EngineRouter.main_proxy(resource).assembly_url(resource),
             subtitle: resource.subtitle,
             remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
-            remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
-            announcement: resource.announcement,
             developer_group: resource.developer_group,
             local_area: resource.local_area,
             meta_scope: resource.meta_scope,
@@ -39,18 +37,14 @@ module Decidim
             creation_date: resource.creation_date,
             closing_date_reason: resource.closing_date_reason,
             internal_organisation: resource.internal_organisation,
-            is_transparent: resource.is_transparent,
+            access_mode: resource.access_mode,
             special_features: resource.special_features,
             twitter_handler: resource.twitter_handler,
             instagram_handler: resource.instagram_handler,
             facebook_handler: resource.facebook_handler,
             youtube_handler: resource.youtube_handler,
             github_handler: resource.github_handler,
-            created_by_other: resource.created_by_other,
-            assembly_type: {
-              id: resource.assembly_type.try(:id),
-              title: resource.assembly_type.try(:title) || empty_translatable
-            }
+            created_by_other: resource.created_by_other
           }
         )
       end

data/app/views/decidim/assemblies/admin/assemblies/_assemblies_thead.html.erb

@@ -7,7 +7,7 @@
     <%= sort_link(query, :created_at, t("models.assembly.fields.created_at", scope: "decidim.admin"), default_order: :desc) %>
   </th>
   <th>
-    <%= sort_link(query, :private_space, t("models.assembly.fields.private", scope: "decidim.admin")) %>
+    <%= sort_link(query, :access_mode, t("models.assembly.fields.access_mode", scope: "decidim.admin")) %>
   </th>
   <th class="table-list__actions">
     <%= sort_link(query, :published_at, t("models.assembly.fields.published", scope: "decidim.admin")) %>

data/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb

@@ -33,12 +33,11 @@
   <td class="table-list__date" data-label="<%= t("models.assembly.fields.created_at", scope: "decidim.admin") %>">
     <%= l(assembly.created_at, format: :short) %>
   </td>
-  <td class="table-list__state" data-label="<%= t("models.assembly.fields.private", scope: "decidim.admin") %>">
-    <% if assembly.private_space? %>
-      <span><%= t("assemblies.index.private", scope: "decidim.admin") %></span>
-    <% else %>
-      <span><%= t("assemblies.index.public", scope: "decidim.admin") %></span>
-    <% end %>
+  <td class="table-list__state" data-label="<%= t("models.assembly.fields.access_mode", scope: "decidim.admin") %>">
+    <%# i18n-tasks-use t("decidim.admin.assemblies.index.access_modes.open") %>
+    <%# i18n-tasks-use t("decidim.admin.assemblies.index.access_modes.restricted") %>
+    <%# i18n-tasks-use t("decidim.admin.assemblies.index.access_modes.transparent") %>
+    <span><%= t(assembly.access_mode, scope: "decidim.admin.assemblies.index.access_modes") %></span>
   </td>
   <td class="table-list__state" data-label="<%= t("models.assembly.fields.published", scope: "decidim.admin") %>">
     <% if assembly.published? %>

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

@@ -48,9 +48,6 @@
         <%= form.translated :editor, :internal_organisation, aria: { label: :internal_organisation } %>
       </div>
 
-      <div class="row column">
-        <%= form.translated :editor, :announcement, help_text: t(".announcement_help") %>
-      </div>
     </div>
   </div>
   <div class="card" data-controller="accordion" id="accordion-duration">
@@ -101,10 +98,6 @@
         <div class="columns">
           <%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
-
-        <div class="columns">
-          <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-        </div>
       </div>
     </div>
   </div>
@@ -176,6 +169,39 @@
     </div>
   </div>
 
+  <div class="card" data-controller="accordion access-mode" id="accordion-access">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-access" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="access">
+          <%= t("label", scope: "decidim.assemblies.admin.assemblies.form.access") %>
+        </h2>
+      </button>
+    </div>
+    <div id="panel-access" class="card-section">
+      <div class="row column" id="has_members">
+        <%= form.check_box :has_members, help_text: t(".has_members_help") %>
+      </div>
+
+      <fieldset class="row column" id="access_mode">
+        <legend>
+          <%= t("access.set_this_space_as", scope: "decidim.assemblies.admin.assemblies.form") %>
+        </legend>
+        <div class="radio-group">
+          <%# i18n-tasks-use t("decidim.assemblies.admin.assemblies.form.access.options.open") %>
+          <%# i18n-tasks-use t("decidim.assemblies.admin.assemblies.form.access.options.restricted") %>
+          <%# i18n-tasks-use t("decidim.assemblies.admin.assemblies.form.access.options.transparent") %>
+          <% Decidim::Assembly::ACCESS_MODES.keys.each do |mode| %>
+            <%= label_tag nil, class: "form__wrapper-checkbox-label" do %>
+              <%= form.radio_button :access_mode, mode %>
+              <span><%= t(mode, scope: "decidim.assemblies.admin.assemblies.form.access.options") %></span>
+             <% end %>
+          <% end %>
+        </div>
+      </fieldset>
+    </div>
+  </div>
+
   <div class="card" data-controller="accordion" id="accordion-visibility">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
@@ -185,7 +211,6 @@
         </h2>
       </button>
     </div>
-
     <div id="panel-visibility" class="card-section">
       <% if params[:parent_id].present? %>
         <%= form.hidden_field :parent_id, value: @form.parent_id %>
@@ -200,15 +225,6 @@
       <div class="row column">
         <%= form.check_box :promoted %>
       </div>
-
-      <div class="row column" id="private_space">
-        <%= form.check_box :private_space %>
-        <p class="help-text"><%= t(".private_notice") %></p>
-      </div>
-
-      <div class="row column" id="is_transparent">
-        <%= form.check_box :is_transparent %>
-      </div>
     </div>
   </div>
 

data/app/views/decidim/assemblies/admin/assemblies/edit.html.erb

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="assemblies">
 
   <% if parent_assembly && parent_assembly.self_and_ancestors.length %>

data/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+    <%= t(".title") %>
   </h1>
 </div>
 <div class="card" id="assemblies">

data/app/views/decidim/assemblies/admin/assemblies/new.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t "assemblies.new.title", scope: "decidim.admin" %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 <div class="item__edit item__edit-1col">

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="card" id="assembly_admins">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :assembly_user_role %>
          <%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
       <% end %>

data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 <div class="item__edit item__edit-1col">

data/app/views/decidim/assemblies/assemblies/_collection.html.erb

@@ -1,4 +1,4 @@
-<h2 class="h5 md:h3 decorator"><%= t("assemblies.order_by_assemblies.assemblies", scope: "layouts.decidim", count: collection.total_count) %></h2>
+<h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("assemblies.order_by_assemblies.assemblies", scope: "layouts.decidim", count: collection.total_count) %></h2>
 
 <div class="card__grid-grid">
   <%= render(collection) %>

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -6,7 +6,7 @@
 
 <%
 edit_link(
-  resource_locator(current_participatory_space).edit,
+  decidim_admin_assemblies.edit_assembly_landing_page_path(current_participatory_space),
   :update,
   :assembly,
   assembly: current_participatory_space
@@ -16,9 +16,15 @@ edit_link(
 <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 
 <main>
-  <% if current_participatory_space.private_space? %>
+  <% if current_participatory_space.restricted? %>
     <section class="participatory-space__block-reference alert">
-      <%= t("private_space", scope: "decidim.assemblies.show") %>
+      <%= t("restricted_space", scope: "decidim.participatory_spaces.show") %>
+    </section>
+  <% end %>
+
+  <% if current_participatory_space.transparent? %>
+    <section class="participatory-space__block-reference alert">
+      <%= t("transparent_space", scope: "decidim.participatory_spaces.show") %>
     </section>
   <% end %>
 

data/app/views/decidim/assemblies/members/index.html.erb

@@ -0,0 +1,24 @@
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
+<% add_decidim_meta_tags(
+     title: translated_attribute(current_participatory_space.title),
+     resource: current_participatory_space) %>
+<%
+edit_link(
+  decidim_admin_assemblies.members_path(current_participatory_space.slug),
+  :update,
+  :assembly,
+  assembly: current_participatory_space
+)
+%>
+
+<% content_for :aside do %>
+  <h1 class="title-decorator">
+    <%= t("members", scope: "decidim.participatory_space_members.index") %>
+  </h1>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+  <section class="layout-main__section">
+    <%= render(collection) %>
+  </section>
+<% end %>

data/config/locales/ar.yml

@@ -1,4 +1,3 @@
----
 ar:
   activemodel:
     attributes:
@@ -36,7 +35,6 @@ ar:
         participatory_processes_ids: العمليات التشاركية ذات الصلة
         participatory_scope: ما الذي تقرر
         participatory_structure: كيف تقرر ذلك
-        private_space: مساحة خاصة
         promoted: سلط الضوء
         published_at: نشرت في
         purpose_of_action: الغرض من العمل
@@ -98,12 +96,9 @@ ar:
         edit:
           update: تحديث
         index:
-          private: خاص
-          public: عامة
           published: نشرت
         new:
           create: إنشاء
-          title: جمعية جديدة
         update:
           error: حدثت مشكلة أثناء تحديث هذه الجمعية.
           success: تم تحديث الجمعية بنجاح.
@@ -129,8 +124,6 @@ ar:
           success: تمت إزالة المشرف بنجاح من هذا التجميع.
         edit:
           update: تحديث
-        index:
-          assembly_admins_title: مدراء الجمعية
         new:
           create: إنشاء
         update:
@@ -145,13 +138,11 @@ ar:
           attachments: المرفقات
           components: المكونات
           moderations: الإعتدال
-          private_users: الأعضاء
       models:
         assembly:
           fields:
             actions: الإجراءات
             created_at: تاريخ الإنشاء
-            private: خاص
             promoted: سلط الضوء
             published: نشرت
             title: العنوان
@@ -173,9 +164,6 @@ ar:
             admin: مدير
             collaborator: متعاون
             moderator: مُشرف
-      titles:
-        assemblies: الجمعيات
-        assemblies_types: أنواع التجمّعات
     admin_log:
       assembly:
         create: "%{user_name} أنشأ الجمعية %{resource_name}"
@@ -205,7 +193,6 @@ ar:
       admin:
         assemblies:
           form:
-            announcement_help: سيظهر النص الذي أدخلته هنا للمستخدم مباشرة تحت معلومات الجمعية.
             duration: المدة الزمنية
             duration_help: إذا كانت مدة هذه الجمعية محدودة ، فحدد تاريخ الانتهاء. خلاف ذلك ، سوف يظهر على أنه غير مسمى.
             images: الصور
@@ -235,9 +222,6 @@ ar:
             all: الكل
         show:
           title: حول الجمعية
-      assembly_members:
-        index:
-          members: الأعضاء
       content_blocks:
         children_assemblies:
           name: جمعيات
@@ -261,17 +245,9 @@ ar:
         title: الجمعيات
       last_activity:
         new_assembly: 'جمعية جديدة:'
-      pages:
-        user_profile:
-          member_of:
-            member_of: عضو في
       show:
         duration: المدة الزمنية
-        private_space: هذه جمعية خاصة
         social_networks_title: زيارة التجمع على
-    assembly_members:
-      index:
-        title: الأعضاء
     events:
       assemblies:
         create_assembly_member:
@@ -295,8 +271,6 @@ ar:
       value_types:
         assembly_presenter:
           not_found: 'لم يتم العثور على التجميع في قاعدة البيانات (المعرف: %{id})'
-        assembly_type_presenter:
-          not_found: 'لم يتم العثور على نوع التجمع في قاعدة البيانات (الرقم-المُعرف: %{id})'
     menu:
       assemblies: الجمعيات
     participatory_processes: