FIX: Do not show invalid option in flair chooser (#13725)

Both of the commits in this PR are meant to fix the problem of invalid
option being shown in the flair chooser. An invalid option can be shown
if at some point it was a valid one - a group with a flair that was
later changed by an admin and flair was removed. The other option an
invalid option can be selected is if the user had a primary group when
the migration ran and copied the same value to the flair_group_id
column.

* FIX: Set flair_group_id only if group has flair

Follow up to 4ba93aac66.

* FIX: Do not show invalid option in flair chooser

If selected flair group became unavailable because the flair was removed
then the option would still be selected and visible as an ID only.
This commit is contained in:
Bianca Nenciu 2021-07-13 19:22:39 +03:00 committed by GitHub
parent 5ea98b4df3
commit 5bff65aa69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions

View File

@ -1,3 +1,4 @@
import { computed } from "@ember/object";
import ComboBoxComponent from "select-kit/components/combo-box";
export default ComboBoxComponent.extend({
@ -11,4 +12,22 @@ export default ComboBoxComponent.extend({
modifyComponentForRow() {
return "flair-row";
},
selectedContent: computed(
"value",
"content.[]",
"selectKit.noneItem",
function () {
const content = (this.content || []).findBy(
this.selectKit.valueProperty,
this.value
);
if (content) {
return this.selectKit.modifySelection(content);
} else {
return this.selectKit.noneItem;
}
}
),
});

View File

@ -5,7 +5,10 @@ class SetUsersFlairGroupId < ActiveRecord::Migration[6.1]
execute <<~SQL
UPDATE users
SET flair_group_id = primary_group_id
WHERE flair_group_id IS NULL
FROM groups
WHERE users.primary_group_id = groups.id AND
users.flair_group_id IS NULL AND
(groups.flair_icon IS NOT NULL OR groups.flair_upload_id IS NOT NULL)
SQL
end
end