Skip to content

Commit 314cd1e

Browse files
AsespinelmarslanabdulraufChrisChVAnas12091101
authored
Teak 3 update (#310)
* fix: refresh-saml-metadata beat task path fixed (openedx#37257) Backports: openedx#37080 * [Teak] feat: Show disabled edit button and tooltip to component in units from libraries [FC-0097] (openedx#37282) * Show disabled edit button and tooltip to component in units from libraries * fix: intermittent "utils attribute not found" issue in webpack_loader (openedx#37306) Backports: openedx#37109 * fix: find and match enterprise user only if enterprise is enabled * chore(deps): openedx-forum upgraded using make upgrade-package * chore: ran make compile requirements --------- Co-authored-by: Muhammad Arslan <arslan.abdulrauf@arbisoft.com> Co-authored-by: Chris Chávez <xnpiochv@gmail.com> Co-authored-by: Muhammad Anas <88967643+Anas12091101@users.noreply.github.com>
1 parent f3822a1 commit 314cd1e

11 files changed

Lines changed: 71 additions & 16 deletions

File tree

‎cms/static/sass/course-unit-mfe-iframe-bundle.scss‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,42 @@ body,
618618
}
619619
}
620620

621+
.lib-edit-warning-tooltipbox {
622+
.tooltiptext {
623+
visibility: hidden;
624+
position: absolute;
625+
width: 200px;
626+
background-color: $black;
627+
color: $white;
628+
text-align: center;
629+
padding: 5px;
630+
border-radius: 6px;
631+
z-index: 1;
632+
top: 50%;
633+
right: 100%;
634+
margin-right: 10px;
635+
transform: translateY(-50%);
636+
opacity: 0;
637+
transition: opacity 0.3s;
638+
}
639+
640+
.tooltiptext::after {
641+
content: "";
642+
position: absolute;
643+
top: 50%;
644+
left: 100%;
645+
transform: translateY(-50%);
646+
border-width: 5px;
647+
border-style: solid;
648+
border-color: transparent transparent transparent $black;
649+
}
650+
651+
&:hover .tooltiptext {
652+
visibility: visible;
653+
opacity: 1;
654+
}
655+
}
656+
621657
.action-edit {
622658
.action-button-text {
623659
display: none;
@@ -632,6 +668,13 @@ body,
632668
display: none;
633669
}
634670

671+
&.disabled-button {
672+
pointer-events: all;
673+
opacity: .5;
674+
cursor: default;
675+
border-color: $transparent
676+
}
677+
635678
&::before {
636679
@extend %icon-position;
637680

‎cms/templates/studio_xblock_wrapper.html‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
% endif
153153
% if not show_inline:
154154
<li class="action-item action-edit">
155-
<button class="btn-default edit-button action-button" data-usage-id=${xblock.scope_ids.usage_id}>
155+
<button class="btn-default edit-button action-button" data-usage-id=${xblock.scope_ids.usage_id} data-tooltip="${_("Edit")}">
156156
<span class="icon fa fa-pencil" aria-hidden="true"></span>
157157
<span class="action-button-text">${_("Edit")}</span>
158158
</button>
@@ -211,6 +211,18 @@
211211
<span data-tooltip="${_('Drag to reorder')}" class="drag-handle action"></span>
212212
</li>
213213
% endif
214+
% else:
215+
% if not show_inline:
216+
<li class="action-item action-edit">
217+
<div class="lib-edit-warning-tooltipbox">
218+
<button class="btn-default edit-button action-button disabled-button" data-usage-id=${xblock.scope_ids.usage_id} disabled>
219+
<span class="icon fa fa-pencil" aria-hidden="true"></span>
220+
<span class="action-button-text">${_("Edit")}</span>
221+
</button>
222+
<span class="tooltiptext">${_('Components within a library referenced object cannot be edited')}</span>
223+
</div>
224+
</li>
225+
% endif
214226
% endif
215227
% endif
216228
</ul>

‎common/djangoapps/third_party_auth/pipeline.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,7 @@ def associate_by_email_if_saml(auth_entry, backend, details, user, strategy, *ar
787787
788788
This association is done ONLY if the user entered the pipeline belongs to SAML provider.
789789
"""
790+
from openedx.features.enterprise_support.api import enterprise_is_enabled
790791

791792
def get_user():
792793
"""
@@ -795,6 +796,7 @@ def get_user():
795796
user_details = {'email': details.get('email')} if details else None
796797
return get_user_from_email(user_details or {})
797798

799+
@enterprise_is_enabled()
798800
def associate_by_email_if_enterprise_user():
799801
"""
800802
If the learner arriving via SAML is already linked to the enterprise customer linked to the same IdP,

‎lms/envs/production.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def get_env_setting(setting):
420420
# If we didn't override the value in YAML, OR we overrode it to a truthy value,
421421
# then update CELERYBEAT_SCHEDULE.
422422
CELERYBEAT_SCHEDULE['refresh-saml-metadata'] = {
423-
'task': 'common.djangoapps.third_party_auth.fetch_saml_metadata',
423+
'task': 'common.djangoapps.third_party_auth.tasks.fetch_saml_metadata',
424424
'schedule': datetime.timedelta(hours=hours),
425425
}
426426

‎requirements/common_constraints.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@
1616
# this file from Github directly. It does not require packaging in edx-lint.
1717

1818
# using LTS django version
19-
Django<5.0
19+
Django<6.0
2020

2121
# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
2222
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
2323
# See https://github.com/openedx/edx-platform/issues/35126 for more info
2424
elasticsearch<7.14.0
25-
26-
# Cause: https://github.com/openedx/edx-lint/issues/458
27-
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
28-
pip<24.3

‎requirements/edx/base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ openedx-filters==2.0.1
815815
# -r requirements/edx/kernel.in
816816
# lti-consumer-xblock
817817
# ora2
818-
openedx-forum==0.3.4
818+
openedx-forum==0.3.6
819819
# via -r requirements/edx/kernel.in
820820
openedx-learning==0.26.0
821821
# via

‎requirements/edx/development.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ openedx-filters==2.0.1
13741374
# -r requirements/edx/testing.txt
13751375
# lti-consumer-xblock
13761376
# ora2
1377-
openedx-forum==0.3.4
1377+
openedx-forum==0.3.6
13781378
# via
13791379
# -r requirements/edx/doc.txt
13801380
# -r requirements/edx/testing.txt

‎requirements/edx/doc.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ openedx-filters==2.0.1
986986
# -r requirements/edx/base.txt
987987
# lti-consumer-xblock
988988
# ora2
989-
openedx-forum==0.3.4
989+
openedx-forum==0.3.6
990990
# via -r requirements/edx/base.txt
991991
openedx-learning==0.26.0
992992
# via

‎requirements/edx/testing.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ openedx-filters==2.0.1
10441044
# -r requirements/edx/base.txt
10451045
# lti-consumer-xblock
10461046
# ora2
1047-
openedx-forum==0.3.4
1047+
openedx-forum==0.3.6
10481048
# via -r requirements/edx/base.txt
10491049
openedx-learning==0.26.0
10501050
# via

‎requirements/pip.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ wheel==0.45.1
99

1010
# The following packages are considered to be unsafe in a requirements file:
1111
pip==24.2
12-
# via
13-
# -c requirements/common_constraints.txt
14-
# -r requirements/pip.in
12+
# via -r requirements/pip.in
1513
setuptools==79.0.0
1614
# via -r requirements/pip.in

0 commit comments

Comments
 (0)