Skip to content

Add ability to toggle user groups by organization#4681

Merged
mrcasals merged 9 commits intodecidim:masterfrom
podemos-info:features/disable_user_groups
Jan 8, 2019
Merged

Add ability to toggle user groups by organization#4681
mrcasals merged 9 commits intodecidim:masterfrom
podemos-info:features/disable_user_groups

Conversation

@leio10
Copy link
Copy Markdown
Contributor

@leio10 leio10 commented Dec 19, 2018

🎩 What? Why?

This allows each organization to toggle the whole user groups feature on or off depending on their specific needs.

📌 Related Issues

📋 Subtasks

  • Add CHANGELOG entry
  • Add documentation regarding the feature
  • Add/modify seeds
  • Add tests

📷 Screenshots (optional)

imagen

@ghost ghost assigned leio10 Dec 19, 2018
@ghost ghost added the status: WIP label Dec 19, 2018
@leio10 leio10 force-pushed the features/disable_user_groups branch from 7383b21 to 1149bba Compare December 19, 2018 12:00
@leio10
Copy link
Copy Markdown
Contributor Author

leio10 commented Dec 19, 2018

@decidim/product are you ok with this feature?
If so, @decidim/developers this is ready to be reviewed 😁

@carolromero
Copy link
Copy Markdown
Member

Hi @leio10, thanks for the PR! from @decidim/product side it's ok!

@ghost ghost assigned mrcasals Jan 7, 2019
@ghost ghost added the status: WIP label Jan 7, 2019
@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 7, 2019

I've fixed the conflicts in the CHANGELOG

@mrcasals mrcasals self-requested a review January 7, 2019 14:22
@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 8, 2019

Looks good to me, merging! 😄

@mrcasals mrcasals merged commit 36cc08c into decidim:master Jan 8, 2019
@leio10 leio10 deleted the features/disable_user_groups branch January 8, 2019 08:46
@leio10
Copy link
Copy Markdown
Contributor Author

leio10 commented Jan 8, 2019

❤️ thanks @mrcasals!!
It's a pity that it didn't make it for the 0.16 release.

@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 8, 2019

@leio10 since the 0.16 version hasn't been released yet, I think we can backport it 😄 I'll send the PR!

mrcasals pushed a commit that referenced this pull request Jan 8, 2019
* Added a switch to organizations to disable user groups feature

* Set user_groups_enabled attribute value in admin and system admin

Default value is true, and can be modified by admins.

* User groups methods moved to a new concern from UserProfile

* Disable user groups when on core user pages

* Disable user_groups on amendments

* Disable user groups on admin

* Disable user groups on proposals

* Add changelog entry
@leio10
Copy link
Copy Markdown
Contributor Author

leio10 commented Jan 8, 2019

@mrcasals you're my hero!! 😍😍

@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 8, 2019

@leio10 see #4735!

mrcasals added a commit that referenced this pull request Jan 8, 2019
* Added a switch to organizations to disable user groups feature

* Set user_groups_enabled attribute value in admin and system admin

Default value is true, and can be modified by admins.

* User groups methods moved to a new concern from UserProfile

* Disable user groups when on core user pages

* Disable user_groups on amendments

* Disable user groups on admin

* Disable user groups on proposals

* Add changelog entry
moustachu added a commit to OpenSourcePolitics/decidim that referenced this pull request Feb 8, 2019
* fix display of comments count when comment has been moderated

* [BACKPORT] Use latest docker image for test env (decidim#4731)

* Use latest docker image for test env

* Bump Ruby version to match the one in tests

* Fix conferences dependencies

* Fix bundle version

* Fix bundles

* Backport decidim#4708 to 0.16-stable (decidim#4721)

* Backport decidim#4708 to 16-stable

* Add CHANGELOG entry

* Add ability to toggle user groups by organization (decidim#4681) (decidim#4735)

* Added a switch to organizations to disable user groups feature

* Set user_groups_enabled attribute value in admin and system admin

Default value is true, and can be modified by admins.

* User groups methods moved to a new concern from UserProfile

* Disable user groups when on core user pages

* Disable user_groups on amendments

* Disable user groups on admin

* Disable user groups on proposals

* Add changelog entry

* [BACKPORT] MetricResolver filtering correction (decidim#4736)

* [BACKPORT] MetricResolver filtering correction

* Added CHANGELOG entry

* Fix loading translations on comments (decidim#4728) (decidim#4739)

This way they won't fail when there's a problem

* New Crowdin translations (decidim#4738)

* New translations en.yml (German)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (German)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Basque)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Italian)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Italian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Basque)

* New translations en.yml (Galician)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Catalan)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Dutch)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (French)

* New translations en.yml (Finnish)

* New translations en.yml (Dutch)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Turkish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Swedish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese)

* New translations en.yml (Spanish)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Swedish)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* Update bundles

* 🐛 current_feature deprecated

* Adds environment to open data export task to avoid errors (decidim#4743)

* 🌐 FR --> Concertations #378

* 🌐 FR --> Concertations #378

* 🌐 FR --> Concertations #378

* Fix action authorizer with blank permissions 0.16 backport (decidim#4746)

* Ignore blank permission options in action authorizer

* Add CHANGELOG

* 🐛 #417 : fix exports translatable_attr when first line is empty

- add `empty_translatable` helper to provide blank values
- fix `Decidim::Proposals::ProposalSerializer`
- fix `Decidim::Comments::CommentSerializer`
- fix `Decidim::Accountability::ResultSerializer`
- TODO : need specific tests on headers

* :robot: rubocop offense `C: Style/StringLiterals`

* :bug: #360 fix survey choices export for free text option

* ✨ #216 Survey answer date

* ✨ #226 Survey answer date

* 🤖

* 🐛 #421 fix Proposal mention links

- only replace link when url contains "proposals" path
- prevent switching between components with same item id

* ✨ add mentions for Accountibility Results

- add new `ContentProccessor` objects (`Parser` & `Renderer`)
- add new `ResultPresenter`

* ✨ add mentions for Budgets Projects

- add new `ContentProccessor` objects (`Parser` & `Renderer`)
- add new `ProjectPresenter`

* ✅ fix tests for content parser

* Backport decidim#4778 to 0.16-stable (decidim#4777)

* Move code parent assemblies from index to partial

* Refactor filtered assemblies query

* Refactor filter assemblies helper and partial

* Change tests

* Add CHANGELOG entry

* 🐛 fixes #344 for `NotifyProposalsMentionedJob`

* 🐛 fixes #344 for `NotifyProposalsMentionedJob`

* 🤖 rubocop #344

* ✅ fixes tests for #344

* 🤖 rubocop

* Backport participatory text related evoutives and fixes. (decidim#4801)

* Backport participatory text related evoutives and fixes.

* Add changelog entry.

* Update decidim_app-design Gemfile.lock.

* Update decidim-generators Gemfile.lock.

* Sort this PR's changelog entries for the next v0.16.1.

* [TEST] Update participatory_text.odt document version with non ASCII symbols.

* Backport decidim#4811 to 0.16-stable (decidim#4815)

* Fix attachments not being inherited and add test

* Add CHANGELOG entry

* 🐛 fixes Pagination in assemblies #459

* 🐛 ✉️ add opt out notifications mail link

- #RGPD

* 🐛 unused keys

* 🐛 💚 test_main

* 🐛 💚 test_main

* 🌐 💚 after patch
@paarals
Copy link
Copy Markdown

paarals commented Feb 20, 2019

Hello @leio10 and @mrcasals, I have a very basic doubt. How is it possible that in the changelog of 0.16 and master, is the same PR referenced?

@agustibr
Copy link
Copy Markdown
Contributor

@paarals because its backported, so should the 0.16 Changelog reference the #4735 and not this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants