Verawood release branch - #859
Conversation
…to md5 The hashing algorithm has been changed in cd60646. However, there are Open edX operators who maintain backward compatibility of anonymous user IDs after past rotations of their Django secret key. For them, altering the hashing algorithm was a breaking change that made their analytics inconsistent. (cherry picked from commit 746e4fe) (cherry picked from commit ff6d92f) (cherry picked from commit 7245bdc) (cherry picked from commit 6da7f58) (cherry picked from commit ee3aa4a) (cherry picked from commit 5641d8e) (cherry picked from commit 3150d9e) (cherry picked from commit 634a6dc)
…account is unlinked (cherry picked from commit e83a8c8f82849644cf95534cde3fe149e4f11916) (cherry picked from commit 0c831dc) (cherry picked from commit c596bf3) (cherry picked from commit 64f5dea) (cherry picked from commit 7b12b00) (cherry picked from commit 4fe3892) (cherry picked from commit edf77a0)
fix: give superusers all studio permissions (cherry picked from commit 8ef55754f4a529cc6b784298320fcdb8b415bd83) (cherry picked from commit 8e281a9) (cherry picked from commit f552973) (cherry picked from commit 6de7b64) feat: eSHE Instructor role Adds the eSHE Instructor role, which inherits Course Staff permissions, but isn't able to enroll / un-enroll students and can't assing course team roles unless in combination with Course Staff / Instructor / Discussion admin roles. (cherry picked from commit 5d160c2) (cherry picked from commit a21b4f0) feat: Teaching Assistant role (cherry picked from commit 176de06) (cherry picked from commit 7ef00c0) (cherry picked from commit a0d8806) (cherry picked from commit 45f6593) (cherry picked from commit 7e5756a) (cherry picked from commit 404226e)
9db29fb to
cf16be5
Compare
When a user authenticates using SAML, but their accounts aren't linked, they land on the login page with the message to link their accounts. If the `OC_REDIRECT_ON_TPA_UNLINKED_ACCOUNT` value is not set, they are redirected to `/undefined`. This commit checks that the `redirectURL` is a valid non-empty string before performing the redirect. The bug was introduced in 91f8d36, so this can be safely dropped once that temporary commit is removed from our branches. For Redwood, the relevant commit hash is 64f5dea. Internal-ref: https://tasks.opencraft.com/browse/BB-9010 (cherry picked from commit 9ade4ea) (cherry picked from commit b801f99) (cherry picked from commit 21787b7) (cherry picked from commit ed2d2b5) (cherry picked from commit f9053ef)
cf16be5 to
243e782
Compare
samuelallan72
left a comment
samuelallan72
left a comment
There was a problem hiding this comment.
@xitij2000 do you know the status and history of "temp: Add configuration option to redirect to external site when TAP account is unlinked" - can we remove that commit yet?
I see also that "fix: prevent redirects to /undefined after saml auth" has a note about "The bug was introduced in 91f8d36, so this can be safely dropped once that temporary commit is removed from our branches." If we can drop the temp commit, then we can drop this too; that would be nice.
Regarding fix: prevent null start date in course details, I believe we can drop it based on BB-9629 (comment).
| 'limited_staff': _('Limited Staff'), | ||
| 'beta': _('Beta Tester'), | ||
| 'eshe_instructor': _('eSHE Instructor'), | ||
| 'teaching_assistant': _('Teaching Assistant'), |
There was a problem hiding this comment.
This looks fine to me; only updating display names.
There was a problem hiding this comment.
Yes, this is new for roles I think, since there is now a UI to manage them
|
|
||
| roles = set(ROLES.keys()) | set(FORUM_ROLES) | ||
|
|
||
| roles -= {'eshe_instructor', 'teaching_assistant'} |
There was a problem hiding this comment.
@xitij2000 I'm unsure about what kind of effects this could have - if this removes them from the roles returned here, does this make it impossible to select these roles? cc @viadanna
Also, if we did need to include these updates, I'd be in favour of squashing them into "feat: all eSHE role features squashed in one commit", and updating that commit message to be a little friendlier.
There was a problem hiding this comment.
This is a completely new API, and there have been huge changes to roles and permissions. Adding these were causing test failures and I didn't want to break something else.
@viadanna Do you know what would be the best approach here? how are these used? are they needed anymore?
I can remove this line and look into fixing the tests, but unlike the display names these could have more sideeffects that I don't fully understand.
|
@samuelallan72 I've dropped the null start date change. |
7 participants
Description
Cherry pick of non-upstream commits to OpenCraft's branch for verawood.
Rebased
Dropped, Already Upstream
private-ref: https://tasks.opencraft.com/browse/BB-11000