Add attachments to Initiatives by armandfardeau · Pull Request #5844 · decidim/decidim

armandfardeau · 2020-03-10T11:41:38Z

🎩 What? Why?

Adds the possibility for the user to add a file when filing an initiative, then allows to modify the attachments from the back office.

📌 Related Issues

Related to Add joint file in step 4 of initiative wizard OpenSourcePolitics/dev#14
meta-decidim: https://meta.decidim.org/processes/roadmap/f/122/proposals/15100

📋 Subtasks

Add CHANGELOG entry
Add/modify seeds

📷 Screenshots (optional)

virgile-dev · 2020-03-13T11:34:18Z

@armandfardeau I have a minor bug to report.
As a user trying to add a joint file in the step 4 of the initiative wizard and make mistake, say do not give a title to my attachement, I cannot submit the form and no red error message appears to tell me what is wrong.

Before submission

After submission

armandfardeau · 2020-03-16T10:06:28Z

@armandfardeau I have a minor bug to report.
As a user trying to add a joint file in the step 4 of the initiative wizard and make mistake, say do not give a title to my attachement, I cannot submit the form and no red error message appears to tell me what is wrong.

Before submission

After submission

Indeed that's quite strange! I will check asap :)

virgile-dev · 2020-03-16T12:42:02Z

@armandfardeau If you want to fix this as well at the same time. Might be worth squashing it into this PR : #5860

armandfardeau · 2020-03-16T16:00:57Z

@armandfardeau If you want to fix this as well at the same time. Might be worth squashing it into this PR : #5860

I suggest we fix this after this one.

armandfardeau · 2020-03-17T10:55:18Z

decidim-initiatives/app/forms/decidim/initiatives/initiative_form.rb

+      def trigger_attachment_errors
+        return if attachment.blank?
+        return if attachment.valid?
+
+        attachment.errors.each { |error| errors.add(:attachment, error) }
+
+        attachment = Attachment.new(file: attachment.try(:file))
+
+        errors.add(:attachment, :file) if !attachment.save && attachment.errors.has_key?(:file)
+      end


This little trick solves a part of the problem. Due to wicked's wizard, the validation on the form is not done until the final step, so we ensure that validations are triggered before. Quite sure this is the ugliest way to do it so if someone has an idea, I'm in! 😀

paulinebessoles · 2020-03-30T12:49:50Z

Link to Metadecidim proposal

tramuntanal

Hi @armandfardeau , can you check the tests, merge develop and solve conflicts? 😉

virgile-dev · 2020-05-14T14:34:17Z

@tramuntanal Armand just resolved the conflict. This should be ready to be merged. Thanks in advance.

armandfardeau · 2020-05-14T18:38:42Z

@tramuntanal Hello and sorry for the delay! It should be all good now!

virgile-dev · 2020-05-21T09:04:14Z

@Leusev or @ivan-mr we've applied the requested changes in the review. Could you see if we can merge this one ?

jesusdb · 2020-05-22T10:56:45Z

It looks good to me! But could you check the conflicting files, please?

armandfardeau · 2020-05-25T11:13:16Z

@jesusdb Seems all good to me ;)

virgile-dev · 2020-05-26T07:05:14Z

@jesusdb could you check if we can merge this now ? Thanks in advance !

jesusdb

All right, done! 😄

* develop: Include year in meetings card (decidim#6102) Add attachment enabled option to initiative types and initiatives (decidim#6036) Fix a flaky test in group profile conversations (decidim#6123) Add attachments to Initiatives (decidim#5844) Add initiatives export (decidim#6070) Improvements to conversations with more than one participant (decidim#6094) Elections module and election administration (decidim#6065) Separate forms in steps (decidim#6108) Add sorting by publishing date to initiatives (decidim#6016) Improve proposal preview: Use proposal card when previewing a proposal draft (decidim#6064) Newsletter templates fixes (decidim#6096) # Conflicts: # decidim-initiatives/app/models/decidim/initiative.rb # decidim-initiatives/spec/system/admin/initiative_types_controller_spec.rb

* feature/add_areas_to_initiatives: (30 commits) Adds areas to FO filters Fix lint issue Fixes rubocop issues Updates changelog Adds areas to initiatives Send notification when signature threshold reached (decidim#6098) Adds filter by initiative type to admin panel (decidim#6093) Require confirmation on exiting a survey mid-answering (decidim#6118) Information message when there isn't any Proposal (decidim#6063) Set email asset host dynamically (decidim#5888) Harmonizes the design of initiatives search in FO (decidim#6090) Include year in meetings card (decidim#6102) Add attachment enabled option to initiative types and initiatives (decidim#6036) Fix a flaky test in group profile conversations (decidim#6123) Add attachments to Initiatives (decidim#5844) Add initiatives export (decidim#6070) Improvements to conversations with more than one participant (decidim#6094) Elections module and election administration (decidim#6065) Separate forms in steps (decidim#6108) Add sorting by publishing date to initiatives (decidim#6016) ... # Conflicts: # decidim-initiatives/app/cells/decidim/initiatives/initiative_m_cell.rb # decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative.rb # decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb # decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_form.rb # decidim-initiatives/app/helpers/decidim/initiatives/application_helper.rb # decidim-initiatives/app/models/decidim/initiative.rb # decidim-initiatives/app/services/decidim/initiatives/initiative_search.rb # decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb # decidim-initiatives/app/views/decidim/initiatives/initiatives/_filters.html.erb # decidim-initiatives/app/views/decidim/initiatives/initiatives/_tags.html.erb # decidim-initiatives/config/locales/en.yml # decidim-initiatives/db/migrate/20200514085422_add_area_to_initiatives.rb # decidim-initiatives/db/migrate/20200514102631_add_area_enabled_option_to_initiatives.rb # decidim-initiatives/spec/forms/initiative_form_spec.rb # decidim-initiatives/spec/services/decidim/initiatives/initiative_search_spec.rb # decidim-initiatives/spec/shared/update_initiative_type_example.rb # decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb # decidim-initiatives/spec/system/admin/initiative_types_controller_spec.rb # decidim-initiatives/spec/system/filter_initiatives_spec.rb

armandfardeau added 6 commits March 9, 2020 15:29

Add attachment to user form

caf08b3

Add attachment to create command

267e513

Add attachment to update command

f513ef7

Add attachment to initiative views

9e8cb20

Display attachments to form

572f789

Fix erb style offense

40c482c

armandfardeau changed the title ~~Feature/add attachment to initiatives~~ Feature/add attachments to initiatives Mar 11, 2020

Add changelog entry

51e2b48

armandfardeau marked this pull request as ready for review March 11, 2020 14:34

Fix error in form

654ae4a

armandfardeau commented Mar 17, 2020

View reviewed changes

Normalize locales

7c8d067

andreslucena changed the title ~~Feature/add attachments to initiatives~~ Add attachments to Initiatives Mar 24, 2020

tramuntanal added the in-review label Apr 1, 2020

tramuntanal suggested changes Apr 1, 2020

View reviewed changes

virgile-dev mentioned this pull request Apr 23, 2020

Allow the administrator to disable the addition of attachments on an initiative type OpenSourcePolitics/dev#24

Closed

3 tasks

tramuntanal self-assigned this May 11, 2020

Merge branch 'develop' into feature/add-attachment-to-initiatives

e8c8cb2

armandfardeau and others added 2 commits May 14, 2020 19:07

Process attachment uploads

472549a

Merge branch 'develop' into feature/add-attachment-to-initiatives

af4bba4

jesusdb self-requested a review May 22, 2020 09:44

armandfardeau added 2 commits May 22, 2020 14:39

Merge branch 'develop' into feature/add-attachment-to-initiatives

e0ffb7f

Remove line

28342e6

armandfardeau requested a review from tramuntanal May 25, 2020 11:13

Merge branch 'develop' into feature/add-attachment-to-initiatives

f7ce96c

jesusdb approved these changes May 26, 2020

View reviewed changes

jesusdb merged commit 366a6d6 into decidim:develop May 26, 2020

virgile-dev mentioned this pull request May 29, 2020

Add attachment enabled option to initiative types and initiatives #6036

Merged

2 tasks

Uh oh!

Conversation

armandfardeau commented Mar 10, 2020 • edited by tramuntanal Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎩 What? Why?

📌 Related Issues

📋 Subtasks

📷 Screenshots (optional)

Uh oh!

virgile-dev commented Mar 13, 2020

Uh oh!

armandfardeau commented Mar 16, 2020

Uh oh!

virgile-dev commented Mar 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

armandfardeau commented Mar 16, 2020

Uh oh!

armandfardeau Mar 17, 2020

Choose a reason for hiding this comment

Uh oh!

paulinebessoles commented Mar 30, 2020

Uh oh!

tramuntanal left a comment

Choose a reason for hiding this comment

Uh oh!

virgile-dev commented May 14, 2020

Uh oh!

armandfardeau commented May 14, 2020

Uh oh!

virgile-dev commented May 21, 2020

Uh oh!

jesusdb commented May 22, 2020

Uh oh!

armandfardeau commented May 25, 2020

Uh oh!

virgile-dev commented May 26, 2020

Uh oh!

jesusdb left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

armandfardeau commented Mar 10, 2020 •

edited by tramuntanal

Loading

virgile-dev commented Mar 16, 2020 •

edited

Loading