Fixed some bugs related to activities #1144
Conversation
|
This is a series of bug fixes and improvements in regards to activity handling. DON'T merge this yet, since I still want to confirm some other issues (this part of the code is a bit of a whack-a-mole experience...) |
|
@monstermunchkin @ereslibre now it should be reviewable 😉 There's still some checks that I want to do, and the coverage for activities can certainly be improved, but I'll try to do this in future PRs. |
|
Just added another commit. It should pass tests, but anyways I think it should be safe to review the whole thing. I'll merge this myself once I get lgtm's 😉 |
| a.owner_type = nil | ||
| a.parameters = a.parameters.merge(owner_name: display_username) | ||
| a.save | ||
| end |
There was a problem hiding this comment.
Maybe we can replace the find_each with an update_all so we perform only one query to the database.
There was a problem hiding this comment.
That's what we had before, but we need to:
a.parameters = a.parameters.merge(owner_name: display_username)That's one of the bugs that I caught 😉 Maybe a transaction would've been better so at least everything is done atomically.
| - if activity.owner == activity.recipient | ||
| - if activity.parameters[:team_user] && activity.parameters[:owner_name] | ||
| = "#{activity_owner(activity)} changed the role of #{activity_user_recipient(activity, :team_user)} " | ||
| - elsif activity.owner == activity.recipient | ||
| = "#{activity_owner(activity)} changed its role " |
There was a problem hiding this comment.
Maybe use their role instead of its role?
Besides the mentioned issues, this commit also fixes some activities when deleting users. This commit also fixes most of the issues in SUSE#899, but since this wasn't the goal of this commit, fixing this issue has been left as something to be done in the near future (I'd still need to properly review it). Fixes SUSE#1104 Fixes SUSE#1106 See SUSE#899 Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
Fixes #1104
Fixes #1106
Signed-off-by: Miquel Sabaté Solà msabate@suse.com