decidim-proposals 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b19a02abb665fe2eff1fc28f2baef2d2e53e8c40
-  data.tar.gz: 73283106b1be79337c0dff55080e4aaa60f0c0e4
+  metadata.gz: 4f5ede39ced3c1e0de38bf979f3a1ef578c6a88d
+  data.tar.gz: 70f31bf53bdcf9808b17924a7873c8a1ba73d913
 SHA512:
-  metadata.gz: 6be75326448286187effb03d3fc327ab9bb6fb387c0b759d9173a195de3ff2dca7cb1d1c8aab56b4bd4fe3ce4e992dde537dd4040e4118897459c18edc184c99
-  data.tar.gz: 85db5a6f84aba6e654fba2d85a9b36fa75bb1f82cc279ea620b485a97ddd5cbb3af0ab4016317d9558b80d1a454224a5a358fb2e6b4a0209b7100fd5bc1351b7
+  metadata.gz: 40a1c20970581db8bf5849b7e1080b1951bb03edc5a8b1c9a2c2cea9b4668563b806645d69788cfd28f678064a461a3affec496a719678ba733b09c65b6e5d18
+  data.tar.gz: 6f6078e4b9a93ed927f510291aaeb84d0543e0b2272232e253785dcc243e48f9aee61c76268128a0fb12606710f89f8a0b95fa26e525ba9e1c7fbb423408769a

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -22,6 +22,12 @@ module Decidim
 
         delegate :categories, to: :current_feature, prefix: false
 
+        def map_model(model)
+          return unless model.categorization
+
+          self.category_id = model.categorization.decidim_category_id
+        end
+
         def organization_scopes
           current_organization.scopes
         end

data/app/forms/decidim/proposals/proposal_form.rb

@@ -26,6 +26,12 @@ module Decidim
 
       delegate :categories, to: :current_feature
 
+      def map_model(model)
+        return unless model.categorization
+
+        self.category_id = model.categorization.decidim_category_id
+      end
+
       def organization_scopes
         current_organization.scopes
       end

data/app/models/decidim/proposals/proposal.rb

@@ -33,7 +33,8 @@ module Decidim
       end
 
       def author_name
-        user_group&.name || author&.name || I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
+        return I18n.t("decidim.proposals.models.proposal.fields.official_proposal") if official?
+        user_group&.name || author.name
       end
 
       def author_avatar_url
@@ -100,15 +101,22 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Public: Whether the proposal is official or not.
+      def official?
+        author.nil?
+      end
+
       # Public: Overrides the `notifiable?` Notifiable concern method.
       # When a proposal is commented the proposal's author is notified if it is not the same
       # who has commented the proposal and if the proposal's author has comment notifications enabled.
       def notifiable?(context)
+        return true if official?
         context[:author] != author && author.comments_notifications?
       end
 
       # Public: Overrides the `users_to_notify` Notifiable concern method.
       def users_to_notify
+        return Decidim::Admin::ProcessAdmins.for(feature.participatory_process) if official?
         [author]
       end
     end

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

@@ -53,7 +53,7 @@
                 <% if can? :update, proposal %>
                   <%= icon_link_to "chat", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
                 <% end %>
-                <%= icon_link_to "eye", decidim_proposals.proposal_path(id: proposal, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
+                <%= icon_link_to "eye", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
               </td>
             </tr>
           <% end %>

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

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

data/lib/decidim/proposals/feature.rb

@@ -71,75 +71,69 @@ Decidim.register_feature(:proposals) do |feature|
     exports.serializer Decidim::Comments::CommentSerializer
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
-
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
-        manifest_name: :proposals,
-        published_at: Time.current,
-        participatory_process: process,
-        settings: {
-          vote_limit: 0
-        },
-        step_settings: {
-          process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
-        }
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
+      manifest_name: :proposals,
+      published_at: Time.current,
+      participatory_process: process,
+      settings: {
+        vote_limit: 0
+      },
+      step_settings: {
+        process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
+      }
+    )
+    # So that we have some with global scope
+    scopes = feature.organization.scopes + [nil]
+
+    20.times do |n|
+      author = Decidim::User.where(organization: feature.organization).all.sample
+      user_group = [true, false].sample ? author.user_groups.verified.sample : nil
+      state, answer = if n > 15
+                        ["accepted", Decidim::Faker::Localized.sentence(10)]
+                      elsif n > 9
+                        ["rejected", nil]
+                      elsif n > 6
+                        ["evaluating", nil]
+                      else
+                        [nil, nil]
+                      end
+
+      proposal = Decidim::Proposals::Proposal.create!(
+        feature: feature,
+        category: process.categories.sample,
+        scope: scopes.sample,
+        title: Faker::Lorem.sentence(2),
+        body: Faker::Lorem.paragraphs(2).join("\n"),
+        author: author,
+        user_group: user_group,
+        state: state,
+        answer: answer,
+        answered_at: Time.current
       )
-      categories = feature.participatory_process.categories
-      # So that we have some with global scope
-      scopes = feature.organization.scopes + [nil]
-
-      20.times do |n|
-        author = Decidim::User.where(organization: feature.organization).all.sample
-        user_group = [true, false].sample ? author.user_groups.verified.sample : nil
-
-        proposal = Decidim::Proposals::Proposal.create!(
-          feature: feature,
-          category: categories.sample,
-          scope: scopes.sample,
-          title: Faker::Lorem.sentence(2),
-          body: Faker::Lorem.paragraphs(2).join("\n"),
-          author: author,
-          user_group: user_group
+
+      rand(3).times do |m|
+        email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
+        name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
+
+        author = Decidim::User.find_or_initialize_by(email: email)
+        author.update!(
+          password: "password1234",
+          password_confirmation: "password1234",
+          name: name,
+          organization: feature.organization,
+          tos_agreement: "1",
+          confirmed_at: Time.current,
+          comments_notifications: true,
+          replies_notifications: true
         )
 
-        if n > 15
-          proposal.state = "accepted"
-          proposal.answered_at = Time.current
-          proposal.save!
-        elsif n > 9
-          proposal.state = "rejected"
-          proposal.answered_at = Time.current
-          proposal.answer = Decidim::Faker::Localized.sentence(10)
-          proposal.save!
-        elsif n > 6
-          proposal.state = "evaluating"
-          proposal.answered_at = Time.current
-          proposal.save!
-        end
-
-        rand(3).times do |m|
-          email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
-          name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
-
-          author = Decidim::User.create!(email: email,
-                                         password: "password1234",
-                                         password_confirmation: "password1234",
-                                         name: name,
-                                         organization: feature.organization,
-                                         tos_agreement: "1",
-                                         confirmed_at: Time.current,
-                                         comments_notifications: true,
-                                         replies_notifications: true)
-
-          Decidim::Proposals::ProposalVote.create!(proposal: proposal,
-                                                   author: author)
-        end
-
-        Decidim::Comments::Seed.comments_for(proposal)
+        Decidim::Proposals::ProposalVote.create!(proposal: proposal,
+                                                 author: author)
       end
+
+      Decidim::Comments::Seed.comments_for(proposal)
     end
   end
 end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -5,7 +5,6 @@ module Decidim
     # This class serializes a Proposal so can be exported to CSV, JSON or other
     # formats.
     class ProposalSerializer < Decidim::Exporters::Serializer
-      include Rails.application.routes.url_helpers
       include Decidim::ResourceHelper
 
       # Public: Initializes the serializer with a proposal.
@@ -44,27 +43,14 @@ module Decidim
         proposal.feature
       end
 
-      def organization
-        feature.organization
-      end
-
       def meetings
         @proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
           Decidim::ResourceLocatorPresenter.new(meeting).url
         end
       end
 
-      def participatory_process
-        feature.participatory_process
-      end
-
       def url
-        Decidim::Proposals::Engine.routes.url_helpers.proposal_url(
-          proposal,
-          feature_id: feature,
-          participatory_process_id: participatory_process,
-          host: organization.host
-        )
+        Decidim::ResourceLocatorPresenter.new(proposal).url
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,28 +18,28 @@ 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: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     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
@@ -88,56 +88,70 @@ 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-admin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   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
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   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 proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com