decidim-meetings 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5afd4c00927d61b89f5ac7ecb1b275c779a06c
-  data.tar.gz: f0ddf2eb804d82e0b8c60f851b674b7d6b247749
+  metadata.gz: 30ea072be2a343bf0bb84667728294c6dc3ded5a
+  data.tar.gz: 510360ace6994dd82f35d8f07ee1f4e2a3dc39b0
 SHA512:
-  metadata.gz: d2a9982af80b38b4bb8ab066e69c9dadd881b60ae4e001171ade331eaad12bcc05269b1319b95eddd7631d836fea1af6312b2040e523a7d7d3a114b5d26a1e99
-  data.tar.gz: 01f9e7122b86284eeeba8c337d071e3c5538754cb2370616f2e5c8bedc97f559eb468efbca621b19e326509dab54285a27f49b58dbfba559f1c67cd56099265c
+  metadata.gz: 3d78cca584964606032e1b31cba81b0b5891ba48cbd6144df435bbc3b63b465a9077b8fdc7a9131d75463a95e0b76afcd0560011727cfc6547eb809ee43f9621
+  data.tar.gz: f616788bd5122d7672919ff032ea17c47eed4b7be6dee6be3bc8ac820156080482fef6d40425e02b00c14bf082bedcacdfc16374bd1f419bf58bce82cb2b0cd6

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -31,6 +31,12 @@ module Decidim
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
 
+        def map_model(model)
+          return unless model.categorization
+
+          self.decidim_category_id = model.categorization.decidim_category_id
+        end
+
         def process_scope
           current_feature.participatory_process.scope
         end

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -6,6 +6,7 @@ module Decidim
     module MeetingsHelper
       include Decidim::ApplicationHelper
       include Decidim::TranslationsHelper
+      include Decidim::ResourceHelper
 
       # Public: truncates the meeting description
       #
@@ -14,7 +15,7 @@ module Decidim
       #
       # Returns the meeting's description truncated.
       def meeting_description(meeting, max_length = 120)
-        link = decidim_meetings.meeting_path(meeting, feature_id: meeting.feature, participatory_process_id: meeting.feature.participatory_process)
+        link = resource_locator(meeting).path
         description = translated_attribute(meeting.description)
         tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
         CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)

data/app/services/decidim/meetings/meeting_search.rb

@@ -24,9 +24,9 @@ module Decidim
       # Handle the date filter
       def search_date
         if options[:date] == "upcoming"
-          query.where("start_time >= ? ", Time.current).order("start_time ASC")
+          query.where("start_time >= ? ", Time.current).order(start_time: :asc)
         elsif options[:date] == "past"
-          query.where("start_time <= ? ", Time.current).order("start_time DESC")
+          query.where("start_time <= ? ", Time.current).order(start_time: :desc)
         end
       end
 

data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb

@@ -24,11 +24,11 @@
     <div class="row column">
       <% if @form.proposals %>
         <%= form.select :proposal_ids,
-                        @form.proposals.order("title ASC").pluck(:title, :id),
+                        @form.proposals.order(title: :asc).pluck(:title, :id),
                         { include_blank: true },
                         { multiple: true, class: "chosen-select" }
         %>
       <% end %>
     </div>
   </div>
-</div>
+</div>

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

@@ -46,7 +46,7 @@
                 </td>
               <% end %>
               <td class="table-list__actions">
-                <%= icon_link_to "eye", decidim_meetings.meeting_path(id: meeting, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
+                <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 
                 <% if can? :update, current_feature %>
                   <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>

data/app/views/decidim/meetings/meetings/_tags.html.erb

@@ -1,10 +1,10 @@
 <% if meeting.category.present? || meeting.scope.present? %>
   <ul class="tags tags--meeting" >
     <% if meeting.category.present? %>
-      <li><%= link_to translated_attribute(meeting.category.name), decidim_meetings.meetings_path(filter: { category_id: meeting.category.id }) %></li>
+      <li><%= link_to translated_attribute(meeting.category.name), resource_locator(meeting).index(filter: { category_id: meeting.category.id }) %></li>
     <% end %>
     <% if !current_participatory_process.scope && meeting.scope.present? %>
-      <li><%= link_to meeting.scope.name, decidim_meetings.meetings_path(filter: { scope_id: [meeting.scope.id] }) %></li>
+      <li><%= link_to meeting.scope.name, resource_locator(meeting).index(filter: { scope_id: [meeting.scope.id] }) %></li>
     <% end %>
   </ul>
 <% end %>

data/lib/decidim/meetings/feature.rb

@@ -23,47 +23,43 @@ Decidim.register_feature(:meetings) do |feature|
     meetings.count
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
+      published_at: Time.current,
+      manifest_name: :meetings,
+      participatory_process: process
+    )
 
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
-        published_at: Time.current,
-        manifest_name: :meetings,
-        participatory_process: process
+    3.times do
+      meeting = Decidim::Meetings::Meeting.create!(
+        feature: feature,
+        scope: process.organization.scopes.sample,
+        category: process.categories.sample,
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        location: Decidim::Faker::Localized.sentence,
+        location_hints: Decidim::Faker::Localized.sentence,
+        start_time: 3.weeks.from_now,
+        end_time: 3.weeks.from_now + 4.hours,
+        address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
+        latitude: Faker::Address.latitude,
+        longitude: Faker::Address.longitude
+      )
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
+        attached_to: meeting
+      )
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+        attached_to: meeting
       )
-
-      3.times do
-        meeting = Decidim::Meetings::Meeting.create!(
-          feature: feature,
-          scope: process.organization.scopes.sample,
-          category: process.categories.sample,
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
-          end,
-          location: Decidim::Faker::Localized.sentence,
-          location_hints: Decidim::Faker::Localized.sentence,
-          start_time: 3.weeks.from_now,
-          end_time: 3.weeks.from_now + 4.hours,
-          address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
-          latitude: Faker::Address.latitude,
-          longitude: Faker::Address.longitude
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
-          attached_to: meeting
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-          attached_to: meeting
-        )
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -116,56 +116,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: decidim-proposals
+  name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: decidim-admin
+  name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 description: A meetings component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com