Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: "Copy Unit" button should be behind enable_copy_paste_units flag (#33867)

Browse Source
This commit is contained in:
Braden MacDonald
2023-12-01 13:35:58 -08:00
committed by GitHub
parent f5b246d0e9
commit 99667f6fb6
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
View File

@@ -1387,9 +1387,6 @@ def create_xblock_info( # lint-amnesty, pylint: disable=too-many-statements
else:
xblock_info["staff_only_message"] = False
# If the ENABLE_COPY_PASTE_UNITS feature flag is enabled, we show the newer menu that allows copying/pasting
xblock_info["enable_copy_paste_units"] = ENABLE_COPY_PASTE_UNITS.is_enabled()
# If the ENABLE_TAGGING_TAXONOMY_LIST_PAGE feature flag is enabled, we show the "Manage Tags" options
if use_tagging_taxonomy_list_page():
xblock_info["use_tagging_taxonomy_list_page"] = True
@@ -1402,6 +1399,10 @@ def create_xblock_info( # lint-amnesty, pylint: disable=too-many-statements
xblock, course=course
)
if course_outline or is_xblock_unit:
# If the ENABLE_COPY_PASTE_UNITS feature flag is enabled, we show the newer menu that allows copying/pasting
xblock_info["enable_copy_paste_units"] = ENABLE_COPY_PASTE_UNITS.is_enabled()
if is_xblock_unit and summary_configuration.is_enabled():
xblock_info["summary_configuration_enabled"] = summary_configuration.is_summary_enabled(xblock_info['id'])

1
cms/static/js/views/pages/container_subviews.js
View File

@@ -150,6 +150,7 @@ function($, _, gettext, BaseView, ViewUtils, XBlockViewUtils, MoveXBlockUtils, H
releaseDateFrom: this.model.get('release_date_from'),
hasExplicitStaffLock: this.model.get('has_explicit_staff_lock'),
staffLockFrom: this.model.get('staff_lock_from'),
enableCopyUnit: this.model.get('enable_copy_paste_units'),
course: window.course,
HtmlUtils: HtmlUtils
})

22
cms/templates/js/publish-xblock.underscore
View File

@@ -128,14 +128,16 @@ var visibleToStaffOnly = visibilityState === 'staff_only';
</li>
</ul>
</div>
<div class="wrapper-pub-actions bar-mod-actions">
<ul>
<li>
<button class="btn btn-outline-primary btn-default action-copy">
<span class="icon fa fa-copy" aria-hidden="true"></span>
<span class="button-label"><%- gettext("Copy Unit") %></span>
</button>
</li>
</ul>
</div>
<% if (enableCopyUnit) { %>
<div class="wrapper-pub-actions bar-mod-actions">
<ul>
<li>
<button class="btn btn-outline-primary btn-default action-copy">
<span class="icon fa fa-copy" aria-hidden="true"></span>
<span class="button-label"><%- gettext("Copy Unit") %></span>
</button>
</li>
</ul>
</div>
<% } %>
</div>