Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge hotfix 2.6.1 #4322

Merged
merged 3 commits into from
Sep 9, 2023
Merged

Merge hotfix 2.6.1 #4322

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d895bd
fix regression for SDBELGA-605 (#4223)
tomaskikutis Mar 15, 2023
98516bf
Merge remote-tracking branch 'upstream/hotfix/2.6.1' into merge-hotfi…
dzonidoo Sep 6, 2023
c8c588f
Merge branch 'develop' into merge-hotfix-2.6.1
dzonidoo Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/apps/users/views/edit-form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ <h5>{{ user.username}}</h5>
<div sd-info-item class="user_type sd-check__group-new sd-check__group-new--vertical" ng-if="privileges.users && isNetworkSubscription()" style="margin-bottom: 20px;">
<sd-check ng-true-value="administrator" ng-false-value="user" ng-model="user.user_type" name="user_type" id="user_type">{{ :: 'Administrator'|translate }}</sd-check>
<sd-check ng-model="user.is_author" name="user_author" id="user_author">{{ :: 'Author'|translate }}</sd-check>
<sd-check ng-if="user.is_author" ng-model="user.private" name="user_private" id="user_private">{{'Private' | translate }}</sd-check>
</div>

<div class="field__phone_number form__group form__group--default form__group--mb-3" sd-info-item ng-hide="profileConfig.phone === false">
Expand Down
Loading