Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require confirmation on exiting a survey mid-answering #6118

Merged
merged 9 commits into from May 27, 2020

Conversation

mrcasals
Copy link
Contributor

@mrcasals mrcasals commented May 21, 2020

🎩 What? Why?

Adapts the work on #5765 for surveys.

📌 Related Issues

📋 Subtasks

  • Add CHANGELOG entry

📷 Screenshots (optional)

image

@mrcasals mrcasals added status: WIP contract: PAM2020 Barcelona City Council contract labels May 21, 2020
@mrcasals mrcasals self-assigned this May 21, 2020
@mrcasals mrcasals force-pushed the forms/confirmation-on-exit branch from 40cc22a to c253316 Compare May 25, 2020 13:26
@mrcasals mrcasals linked an issue May 25, 2020 that may be closed by this pull request
6 tasks
@mrcasals mrcasals force-pushed the forms/confirmation-on-exit branch from ceada5a to b7378cc Compare May 26, 2020 06:31
@mrcasals
Copy link
Contributor Author

@decidim/core this has been approved by @decidim/product, can you review it please? 😄

Copy link
Contributor

@microstudi microstudi left a comment

Choose a reason for hiding this comment

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

This seems fine to me, my only question is that it seems to watch only input form types. Should we look at textareas and selects as well?

@mrcasals
Copy link
Contributor Author

@microstudi changes applied! Can you rereview it please? 😄

Copy link
Contributor

@microstudi microstudi left a comment

Choose a reason for hiding this comment

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

thanks!

@microstudi microstudi merged commit 865590a into develop May 27, 2020
@microstudi microstudi deleted the forms/confirmation-on-exit branch May 27, 2020 17:40
ace pushed a commit to aspgems/decidim that referenced this pull request May 28, 2020
* 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
* 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
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jun 3, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl added a commit to codegram/decidim that referenced this pull request Jun 3, 2020
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jun 10, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl added a commit to codegram/decidim that referenced this pull request Jun 10, 2020
jesusdb pushed a commit that referenced this pull request Jun 22, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
microstudi pushed a commit to Platoniq/decidim that referenced this pull request Jul 8, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
# Conflicts:
#	decidim-forms/app/assets/javascripts/decidim/forms/forms.js.es6
anaghavl added a commit that referenced this pull request Jul 23, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
anaghavl added a commit that referenced this pull request Jul 27, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jul 28, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl added a commit to codegram/decidim that referenced this pull request Jul 28, 2020
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jul 28, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl added a commit to codegram/decidim that referenced this pull request Jul 28, 2020
anaghavl added a commit to codegram/decidim that referenced this pull request Jul 28, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (decidim#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (decidim#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
anaghavl added a commit that referenced this pull request Jul 28, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jul 28, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl added a commit to codegram/decidim that referenced this pull request Jul 28, 2020
anaghavl pushed a commit to codegram/decidim that referenced this pull request Jul 28, 2020
* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account
anaghavl added a commit to codegram/decidim that referenced this pull request Jul 28, 2020
anaghavl added a commit to codegram/decidim that referenced this pull request Jul 28, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (decidim#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (decidim#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
mrcasals added a commit that referenced this pull request Aug 14, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
mrcasals added a commit that referenced this pull request Aug 14, 2020
* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
tramuntanal pushed a commit that referenced this pull request Aug 17, 2020
* Base branch

* remove file

* Base branch

* remove file

* Identify translatable resources (#6145)

* Base branch

* remove file

* Require confirmation on exiting a survey mid-answering (#6118)

* Require confirmation on exit

* Add specs

* Use path instead of url

* Fix changelog

* Trigger build

* Fix expected path on test

* Fix method call

* Take textareas and selects into account

* WIP adding concern

* Adding concern in all the models which have translatable fields

* removed :extended_data as translatable field

* WIP adding concern

* Adding concern in all the models which have translatable fields

* Revert "Require confirmation on exiting a survey mid-answering (#6118)"

This reverts commit bdeb933.

* Revert "remove file"

This reverts commit 2565dbb.

* Revert "Base branch"

This reverts commit 2a09cc4.

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>

* Add Decidim global and organization config for machine translation (#6128)

* Adding setting to organizations table and creating global config

* Adding config accessor to core.rb

* Base branch

* Added a check to display machine translation settings and changed initializer value

* Fixing lint issue in migration file

* Adding test and removing test file

Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>
Co-authored-by: anagha <anagha1996@gmail.com>

* Identifying translatable fields in meetings and comments (#6333)

* Base branch

* remove file

* Idenifying translatable fields in meetings and comments

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>

* Identifying translatable fields for proposals (#6346)

* Add machine translation service (#6179)

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
Co-authored-by: Marc Riera <mrc2407@gmail.com>

* Make some fields non-translatable

* Improve spec

* Don't run job if class is not defined

* Improvee method naming

* Machine translation display priority (#6385)

* Add docs on how to enable the integration

* Add docs on how to write a machine translation service

* Improve code strength

* Fix specs

* Fix specs

Co-authored-by: anagha vl <44900292+anaghavl@users.noreply.github.com>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>
Co-authored-by: anagha <anagha1996@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contract: PAM2020 Barcelona City Council contract in-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EPIC: Improve the Survey component
2 participants