Skip to content

[SE-4482] Allow delete course content in Studio only for admin users#360

Merged
nizarmah merged 7 commits intoopencraft-release/koa.3from
skchoudhary/se-4482-allow-delete-in-studio-only-for-admin-koa.3
Jun 27, 2021
Merged

[SE-4482] Allow delete course content in Studio only for admin users#360
nizarmah merged 7 commits intoopencraft-release/koa.3from
skchoudhary/se-4482-allow-delete-in-studio-only-for-admin-koa.3

Conversation

@Skchoudhary
Copy link

@Skchoudhary Skchoudhary commented Jun 16, 2021

Description

This PR and a check to show/hide the delete button on the course content in Studio. With these changes, the delete button is only visible to the admin user one with the CourseInstructor role only and will not be visible to the CourseStaff role users.

Course Outline view for the user when it has admin access to the course
admin_role_user_page_view

Course Outline view for the user when it has staff access to the course
staff_role_user_page_view

Supporting information

JIRA Ticket: SE-4482

Testing instructions

  • Login with staff@example.com on https://studio.pr360.sandbox.opencraft.hosting/.
  • Go to the setting > Course team of the Demonstration Course
  • Add verified@example.com as the staff for the course
  • Login from the verified@example.com on the studio page
  • verified@example.com should not be able to see the delete button on the course outline page.

Reviewers

Copy link

@nizarmah nizarmah left a comment

Choose a reason for hiding this comment

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

👍

  • I tested this by following the testing instructions
  • I read through the code
  • I checked for accessibility issues
  • Includes documentation
  • I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository.

@nizarmah
Copy link

Please refrain from merging this, for now. It will affect other clients, so we'll need to discuss it on the forum or create a waffle switch first.

@nizarmah nizarmah force-pushed the skchoudhary/se-4482-allow-delete-in-studio-only-for-admin-koa.3 branch from 45effb1 to 366f2f6 Compare June 25, 2021 15:22
@nizarmah nizarmah merged commit 9f61f3e into opencraft-release/koa.3 Jun 27, 2021
@nizarmah nizarmah deleted the skchoudhary/se-4482-allow-delete-in-studio-only-for-admin-koa.3 branch June 27, 2021 07:04
nizarmah added a commit that referenced this pull request Jun 27, 2021
…360)

Co-authored-by: Nizar Mahmoud <nizarmah@hotmail.com>
(cherry picked from commit 9f61f3e)
dliberat pushed a commit that referenced this pull request Jul 8, 2021
…360)

Co-authored-by: Nizar Mahmoud <nizarmah@hotmail.com>
(cherry picked from commit 9f61f3e)
gabor-boros added a commit that referenced this pull request Jul 14, 2021
* [SE-4101] fix: address VisibleBlocks caching race condition (openedx#27359) (#349)

* fix: address VisibleBlocks caching race condition
* sets visual block creation in an atomic transaction
* refactor: add logging statement to bulk create

Co-authored-by: Raul Gallegos <raul@opencraft.com>

Co-authored-by: Raul Gallegos <raul@opencraft.com>

* BB-3954 Add toggle for enrollment behavior (#351)

Adds toggle REDIRECT_UNAUTHENTICATED_USER_TO_LOGIN_ON_ENROLL
for enrollment behaviour for unauthenticated user.
If true, the user will be redirected to 'signin_user' route.

Co-authored-by: Arjun Singh Yadav <arjun@opencraft.com>

* [BB-3622] feat:Restrict user create course (#319) (#352)

* Add course creation condition for organization

The condition added to ensure that if the feature is enabled
user will not be able to create the course outside of the organization
in which they belong.

Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>

* fix: update the xblock-lti-consumer commit

* Added new setting CERTIFICATE_DATE_FORMAT for easy customization of (#354)

certificate issued date

(cherry picked from commit 421e661)

* fix: Produce grade report when subsections have future start dates

When getting a subsection grade for a user, instead of failing
if the user can't access that subsection,
fallback to the collected structure.

* Revert "Unhide student-generated certificates toggle"

This reverts commit 8910ccf.

Our clients are no longer using this feature, and edX won't accept this
upstream as-is currently.  See https://github.com/edx/edx-platform/pull/23735 for more information.

Reverting to reduce code drift from upstream.

* chore: update Arabic translations

* fix:Fix function call to check MFE (#359)

Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>

* fix: don't cache ajax request

* feat: add site language config

Cherry-picked from: https://github.com/edx/edx-platform/pull/27696

* Revert "[FAL-1813] fix: codejail issue when using matplotlib (#343)" (#365)

This reverts commit 2143f84.

* Update celery routing for celery 4+ (openedx#25567)

* Update celery routing

- Used routing function instead of class
- Move task queues dictionary to Django settings
- Removed routing_key parameter
- Refactored routing for singleton celery instantiation

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
(cherry picked from commit e3b4d23)

* fix: add missing set_code_owner_attribute imports

(cherry picked from commit d1060d2)

* chore: bump edx-django-utils to 3.12.0

The required `set_code_owner_attribute` decorator was introduced in
v3.12.0, therefore we need to bump the dependency.

(cherry picked from commit f52b84e)

* [SE-4482] Allow delete course content in Studio only for admin users (#360)

Co-authored-by: Nizar Mahmoud <nizarmah@hotmail.com>

* fix: Password reset page throwing not found error (#364)

Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>

* fix: change buttons in wiki modal to anchor tags

The action buttons in wiki modal have href attribute
but does not have an event listener for click.
This PR changes the buttons to anchor tags so that they
work as expected when clicked.

* fix: use high priority queue for celery heartbeat check

Makes HIGH_PRIORITY_QUEUE a derived setting, which allows
HEARTBEAT_CELERY_ROUTING_KEY to use the correct config variant default.

(cherry picked from commit 2a9067a)

* fix: prevent invalidation of allowlisted certificates

The allowlisted certificates were getting invalidated upon visiting the Course
Progress page by users.

This is a rough backport of the Lilac fix (edx#26356). In Lilac, this is gated
by the `certificates_revamp.use_allowlist` Waffle flag. In post-Lilac branches,
this is working out of the box (the flag has been removed in edx#27576).

Jira ticket: BB-4287

* feat: add celery beat configuration

Co-authored-by: Raul Gallegos <raul@opencraft.com>
Co-authored-by: Farhaan Bukhsh <farhaan@opencraft.com>
Co-authored-by: Arjun Singh Yadav <arjun@opencraft.com>
Co-authored-by: pkulkark <pooja@opencraft.com>
Co-authored-by: Shimul Chowdhury <shimul@opencraft.com>
Co-authored-by: João Cabrita <joao.cabrita@opencraft.com>
Co-authored-by: Samuel Walladge <samuel@opencraft.com>
Co-authored-by: Giovanni Cimolin da Silva <giovannicimolin@gmail.com>
Co-authored-by: 0x29a <demid@opencraft.com>
Co-authored-by: Dmitry Gamanenko <dmitry.gamanenko@raccoongang.com>
Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com>
Co-authored-by: Sandeep Choudhary <sandeep@opencraft.com>
Co-authored-by: Nizar Mahmoud <nizarmah@hotmail.com>
Co-authored-by: Agrendalath <piotr@surowiec.it>
xitij2000 pushed a commit that referenced this pull request Nov 22, 2021
…360)

Co-authored-by: Nizar Mahmoud <nizarmah@hotmail.com>
(cherry picked from commit 9f61f3e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants