Skip to content

Adds filter by initiative type to admin panel#6093

Merged
jesusdb merged 11 commits intodecidim:developfrom
aspgems:feature/initiatives_bo_type_filter
May 28, 2020
Merged

Adds filter by initiative type to admin panel#6093
jesusdb merged 11 commits intodecidim:developfrom
aspgems:feature/initiatives_bo_type_filter

Conversation

@ace
Copy link
Copy Markdown
Contributor

@ace ace commented May 13, 2020

🎩 What? Why?

Enable admins to filter initiatives by type

📌 Related Issues

📋 Subtasks

  • Add CHANGELOG entry
  • Add tests

📷 Screenshots (optional)

Captura de pantalla 2020-05-13 a las 16 27 34

@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented May 13, 2020

@ace could you deploy this on osp-decidim.dev.aspgems.com so that @carolromero and I can test it ?

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 13, 2020

Deployed.

@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented May 13, 2020

Thanks @ace it works great !
@carolromero you can test it here https://osp-decidim.dev.aspgems.com/admin/initiatives !

@carolromero
Copy link
Copy Markdown
Member

carolromero commented May 14, 2020

Agree with @virgile-dev, it works nicely, well done @ace!

@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented May 14, 2020

@tramuntanal this has been approved by product. Can you review and see if we can merge ? Thanks in advance !

@jesusdb
Copy link
Copy Markdown
Contributor

jesusdb commented May 25, 2020

Hi @ace, could you please check the "Initiatives / Tests (pull_request)" failing test and the conflicting files?

@jesusdb jesusdb self-requested a review May 25, 2020 11:15
@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 25, 2020 •
edited
Loading

@jesusdb I solved the conflicts. Let's see those specs now. The failing ones were about missing translations that had nothing to do with the PR ¿?
translation missing: en.decidim.events.initiatives.admin.initiative_sent_to_technical_validation.email_xxxxx (xxxx -> subject, intro and outro)

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 25, 2020

So, it seems I did change one locale key (don't ask me why, I have no idea) making those translations 'missing'... 🤦
It should be fixed now.

@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented May 26, 2020

@jesusdb could you check if we can merge this now ? thanks !

@jesusdb
Copy link
Copy Markdown
Contributor

jesusdb commented May 26, 2020

Just re-run one test. Check the conflict file here too, please 😄

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 26, 2020

Feels familiar :D

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 26, 2020

@jesusdb It seems everything is green now. Fingers crossed there's no other merge now and I have to fix the changelog again 😝

@jesusdb
Copy link
Copy Markdown
Contributor

jesusdb commented May 27, 2020

I have good and bad news.

The good news is that your PR # 6090 has been merged.
The bad news is that it means you have to resolve the changelog conflict again 😅

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 27, 2020

I saw it... and was waiting for this 😛

jesusdb
jesusdb approved these changes May 28, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@jesusdb jesusdb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to merge!

@jesusdb jesusdb merged commit 94a4ea4 into decidim:develop May 28, 2020
@ace ace deleted the feature/initiatives_bo_type_filter branch May 28, 2020 08:38
ace pushed a commit to aspgems/decidim that referenced this pull request May 28, 2020
Merge branch 'feature/add_areas_to_initiatives' into deploy
cb2252c 
* 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
ace pushed a commit to aspgems/decidim that referenced this pull request May 29, 2020
Merge branch 'develop' into feature/initiatives-signature-gauge
7c376b8 
* develop:
  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)
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jun 3, 2020
@anaghavl
Adds filter by initiative type to admin panel (decidim#6093)
a9e90e6 
* Adds filter by initiative type to admin panel

* Updates changelog

* Fixed lint issue

* Normalizes locale file

* Remove unneeded each in spec

* Removes trailing spaces

* Reverts locale file change
@federico-de-lellis federico-de-lellis mentioned this pull request May 5, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jesusdb jesusdb jesusdb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jesusdb jesusdb

Labels

in-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ace @virgile-dev @carolromero @jesusdb