decidim-assemblies 0.24.3 → 0.25.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7780d892e6468fdd163051447390c4edbb84d9cb4f2e38e6a634e30fc987961f
-  data.tar.gz: d48fc9be1cf5acae50f06da3aad41b52333964efa0dfe3e85a1301c7dad11fca
+  metadata.gz: cbc9994a18eae0c7d1f625e52537e7fbfb780c5988218fa02cfefbabcc84ca4d
+  data.tar.gz: 3733bbac11e1e743b257606c725fe6404d7f1ca82963f7c3fcc36a86f2bf12b7
 SHA512:
-  metadata.gz: ea12b06eadcdbfb3ac279f061ec8b6d0c5226391bae29347c3b0810b7b658df808451ec794a2f3c5269786244f566fb2215bf27bf7db2967b4f9bc7d923c6cdc
-  data.tar.gz: e368d64d4232e808fe80646ee00f7df8719d54379dacbe89da6c79d446a7567390b43f0ff7358580f7179085a2bab039124e0f339ee020e078900d9959ecb674
+  metadata.gz: 110784b0bbdeca53efb6a6a316c58aaa6ecf06c5a515a964eeb187d9215eaa346083a9416e7df4f9d3cc2145a56a845f67808afcc35d1dc98ad6b92dae604af8
+  data.tar.gz: 8a9322a0e19c16168c642cc3f1d1eef35d66c98d2a802cc9692201c71bba8a7ca2f14d6d7424bd23eab35f06b23e4f294a2f355f07a0b64707d312f30a2e88b3

data/app/cells/decidim/assemblies/assembly_m_cell.rb

@@ -27,7 +27,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.hero_image.url
+        model.attached_uploader(:hero_image).path
       end
 
       def statuses

data/app/cells/decidim/assemblies/assembly_member/show.erb

@@ -24,7 +24,7 @@
                   <% end %>
                 </div>
               <% else %>
-                <div class="author__avatar"><%= image_tag asset_path("decidim/default-avatar.svg"), alt: "member-avatar" %></div>
+                <div class="author__avatar"><%= image_tag asset_pack_path("media/images/default-avatar.svg"), alt: "member-avatar" %></div>
                 <div>
                   <div class="author__name--container">
                     <div class="author__name">

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb

@@ -8,7 +8,7 @@
           <div class="column">
             <%= link_to decidim_assemblies.assembly_path(assembly), class: "card card--assembly card--mini" do %>
               <div aria-hidden="true" class="card__image-top"
-                style="background-image:url(<%= assembly.hero_image.url %>)"></div>
+                style="background-image:url(<%= assembly.attached_uploader(:hero_image).path %>)"></div>
               <div class="card__content">
                 <span class="card__title card__link"><%= translated_attribute assembly.title %></span>
               </div>

data/app/commands/decidim/assemblies/admin/copy_assembly.rb

@@ -26,6 +26,7 @@ module Decidim
 
           Assembly.transaction do
             copy_assembly
+            copy_assembly_attachments
             copy_assembly_categories if @form.copy_categories?
             copy_assembly_components if @form.copy_components?
           end
@@ -46,8 +47,6 @@ module Decidim
             hashtag: @assembly.hashtag,
             description: @assembly.description,
             short_description: @assembly.short_description,
-            hero_image: @assembly.hero_image,
-            banner_image: @assembly.banner_image,
             promoted: @assembly.promoted,
             scope: @assembly.scope,
             parent: @assembly.parent,
@@ -57,10 +56,19 @@ module Decidim
             target: @assembly.target,
             participatory_scope: @assembly.participatory_scope,
             participatory_structure: @assembly.participatory_structure,
-            meta_scope: @assembly.meta_scope
+            meta_scope: @assembly.meta_scope,
+            announcement: @assembly.announcement
           )
         end
 
+        def copy_assembly_attachments
+          [:hero_image, :banner_image].each do |attribute|
+            next unless @assembly.attached_uploader(attribute).attached?
+
+            @copied_assembly.send(attribute).attach(@assembly.send(attribute).blob)
+          end
+        end
+
         def copy_assembly_categories
           @assembly.categories.each do |category|
             Category.create!(

data/app/commands/decidim/assemblies/admin/create_assembly.rb

@@ -82,7 +82,8 @@ module Decidim
             facebook_handler: form.facebook_handler,
             instagram_handler: form.instagram_handler,
             youtube_handler: form.youtube_handler,
-            github_handler: form.github_handler
+            github_handler: form.github_handler,
+            announcement: form.announcement
           )
         end
 

data/app/commands/decidim/assemblies/admin/create_assembly_member.rb

@@ -67,12 +67,16 @@ module Decidim
           )
         end
 
+        def followers
+          form.user.is_a?(Decidim::UserGroup) ? form.user.users : [form.user]
+        end
+
         def notify_assembly_member_about_new_membership
           data = {
             event: "decidim.events.assemblies.create_assembly_member",
             event_class: Decidim::Assemblies::CreateAssemblyMemberEvent,
             resource: assembly,
-            followers: [form.user]
+            followers: followers
           }
           Decidim::EventsManager.publish(data)
         end

data/app/commands/decidim/assemblies/admin/update_assembly.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new participatory
       # assembly in the system.
       class UpdateAssembly < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # assembly - the Assembly to update
@@ -95,17 +97,11 @@ module Decidim
             instagram_handler: form.instagram_handler,
             youtube_handler: form.youtube_handler,
             github_handler: form.github_handler,
-            weight: form.weight
-          }.merge(uploader_attributes)
-        end
-
-        def uploader_attributes
-          {
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image
-          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
+            weight: form.weight,
+            announcement: form.announcement
+          }.merge(
+            attachment_attributes(:hero_image, :banner_image)
+          )
         end
 
         def participatory_processes(assembly)

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -87,11 +87,7 @@ module Decidim
         end
 
         def assembly_params
-          {
-            id: params[:slug],
-            hero_image: current_assembly.hero_image,
-            banner_image: current_assembly.banner_image
-          }.merge(params[:assembly].to_unsafe_h)
+          { id: params[:slug] }.merge(params[:assembly].to_unsafe_h)
         end
       end
     end

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -30,6 +30,7 @@ module Decidim
         translatable_attribute :subtitle, String
         translatable_attribute :target, String
         translatable_attribute :title, String
+        translatable_attribute :announcement, String
 
         attribute :created_by, String
         attribute :facebook_handler, String
@@ -60,8 +61,8 @@ module Decidim
 
         attribute :banner_image
         attribute :hero_image
-        attribute :remove_banner_image
-        attribute :remove_hero_image
+        attribute :remove_banner_image, Boolean, default: false
+        attribute :remove_hero_image, Boolean, default: false
 
         validates :area, presence: true, if: proc { |object| object.area_id.present? }
 

data/app/forms/decidim/assemblies/admin/assembly_import_form.rb

@@ -8,6 +8,7 @@ module Decidim
       #
       class AssemblyImportForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         JSON_MIME_TYPE = "application/json"
         # Accepted mime types

data/app/forms/decidim/assemblies/admin/assembly_member_form.rb

@@ -34,7 +34,7 @@ module Decidim
         end
 
         def user
-          @user ||= current_organization.users.find_by(id: user_id)
+          @user ||= current_organization.user_entities.find_by(id: user_id)
         end
 
         def positions_for_select

data/app/helpers/decidim/assemblies/admin/assemblies_admin_menu_helper.rb

@@ -4,11 +4,6 @@ module Decidim
   module Assemblies
     module Admin
       module AssembliesAdminMenuHelper
-        include Decidim::Admin::SidebarMenuHelper
-
-        def admin_assemblies_menu
-          @admin_assemblies_menu ||= sidebar_menu(:admin_assemblies_menu)
-        end
       end
     end
   end

data/app/models/decidim/assembly.rb

@@ -40,7 +40,7 @@ module Decidim
 
     translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
                         :target, :participatory_scope, :participatory_structure, :purpose_of_action, :composition, :created_by_other,
-                        :closing_date_reason, :internal_organisation, :special_features
+                        :closing_date_reason, :internal_organisation, :special_features, :announcement
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -69,11 +69,11 @@ module Decidim
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
     belongs_to :parent, class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
 
-    validates_upload :hero_image
-    mount_uploader :hero_image, Decidim::HeroImageUploader
+    has_one_attached :hero_image
+    validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
-    validates_upload :banner_image
-    mount_uploader :banner_image, Decidim::BannerImageUploader
+    has_one_attached :banner_image
+    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
 
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }

data/app/models/decidim/assembly_member.rb

@@ -9,7 +9,7 @@ module Decidim
 
     POSITIONS = %w(president vice_president secretary other).freeze
 
-    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::UserBaseEntity", optional: true
     belongs_to :assembly, foreign_key: "decidim_assembly_id", class_name: "Decidim::Assembly"
     alias participatory_space assembly
 

data/app/packs/entrypoints/decidim_assemblies.js

@@ -0,0 +1,5 @@
+import "src/decidim/assemblies/assemblies"
+import "src/decidim/assemblies/orgchart"
+
+// Images
+require.context("../images", true)

data/app/packs/entrypoints/decidim_assemblies_admin.js

@@ -0,0 +1,3 @@
+import "src/decidim/assemblies/admin/assemblies"
+import "src/decidim/assemblies/admin/assembly_members"
+import "src/decidim/slug_form"

data/app/packs/src/decidim/assemblies/admin/assemblies.js

@@ -0,0 +1,63 @@
+$(() => {
+  const $assemblyScopeEnabled = $("#assembly_scopes_enabled");
+  const $assemblyScopeId = $("#assembly_scope_id");
+
+  if ($(".edit_assembly, .new_assembly").length > 0) {
+    $assemblyScopeEnabled.on("change", (event) => {
+      const checked = event.target.checked;
+      window.theDataPicker.enabled($assemblyScopeId, checked);
+    })
+    window.theDataPicker.enabled($assemblyScopeId, $assemblyScopeEnabled.prop("checked"));
+  }
+
+  const $form = $(".assembly_form_admin");
+
+  if ($form.length > 0) {
+
+    const $privateSpace = $form.find("#private_space");
+    const $isTransparent = $form.find("#is_transparent");
+    const $specialFeatures = $form.find("#special_features");
+
+
+    const toggleDisabledHiddenFields = () => {
+      const enabledPrivateSpace = $privateSpace.find("input[type='checkbox']").prop("checked");
+      $isTransparent.find("input[type='checkbox']").attr("disabled", "disabled");
+      $specialFeatures.hide();
+
+      if (enabledPrivateSpace) {
+        $isTransparent.find("input[type='checkbox']").attr("disabled", !enabledPrivateSpace);
+        $specialFeatures.show();
+      }
+    };
+
+    $privateSpace.on("change", toggleDisabledHiddenFields);
+    toggleDisabledHiddenFields();
+
+    const $assemblyType = $form.find("#assembly_assembly_type");
+    const $assemblyTypeOther = $form.find("#assembly_type_other");
+
+    const $assemblyCreatedBy = $form.find("#assembly_created_by");
+    const $assemblyCreatedByOther = $form.find("#created_by_other");
+
+    const toggleDependsOnSelect = ($target, $showDiv) => {
+      const value = $target.val();
+      $showDiv.hide();
+      if (value === "others") {
+        $showDiv.show();
+      }
+    };
+
+    $assemblyType.on("change", (ev) => {
+      const $target = $(ev.target);
+      toggleDependsOnSelect($target, $assemblyTypeOther);
+    });
+
+    $assemblyCreatedBy.on("change", (ev) => {
+      const $target = $(ev.target);
+      toggleDependsOnSelect($target, $assemblyCreatedByOther);
+    });
+
+    toggleDependsOnSelect($assemblyType, $assemblyTypeOther);
+    toggleDependsOnSelect($assemblyCreatedBy, $assemblyCreatedByOther);
+  }
+});

data/app/{assets/javascripts/decidim/assemblies/admin/assembly_members.js.es6 → packs/src/decidim/assemblies/admin/assembly_members.js}

@@ -1,6 +1,6 @@
-((exports) => {
-  const { createFieldDependentInputs } = exports.DecidimAdmin;
+import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
+$(() => {
   const $assemblyMemberType = $("#assembly_member_existing_user");
 
   createFieldDependentInputs({
@@ -34,4 +34,4 @@
       return $field.val() === "other"
     }
   });
-})(window);
+})

data/app/packs/src/decidim/assemblies/assemblies.js

@@ -0,0 +1,14 @@
+$(() => {
+  $(".show-more").on("click", function() {
+    /* eslint-disable no-invalid-this */
+    $(this).hide();
+    $(".show-more-panel").removeClass("hide");
+    $(".hide-more").show();
+  });
+
+  $(".hide-more").on("click", function() {
+    $(this).hide();
+    $(".show-more-panel").addClass("hide");
+    $(".show-more").show();
+  });
+})