merge master -Dorg -Ssuccess-only: PR 516 (Handle sudo connection in …

…the account view)
snoopycrimecop · Dec 6, 2023 · ae17204 · ae17204
2 parents 3177ca9 + 80e14e3
commit ae17204
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/omeroweb/webadmin/templates/webadmin/myaccount.html b/omeroweb/webadmin/templates/webadmin/myaccount.html
@@ -293,7 +293,7 @@
 
                {% if ldapAuth %}
                <div id="password"><label>LDAP: </label>{{ ldapAuth }}</div>
-               {% else %}
+               {% elif not isSudo %}
 
                <div id="password">
 
@@ -308,8 +308,9 @@
                </div>
                {% endif %}
 
-
+               {% if not isSudo %}
                <input type="submit" value="{% trans 'Save' %}" />
+               {% endif %}
              </div>
             <div style="clear:both"></div>
        </form>

diff --git a/omeroweb/webadmin/views.py b/omeroweb/webadmin/views.py
@@ -1037,6 +1037,7 @@ def my_account(request, action=None, conn=None, **kwargs):
         isLdapUser,
         hasAvatar,
     ) = prepare_experimenter(conn)
+    isSudo = conn.getEventContext().sudoerId is not None
     try:
         defaultGroupId = defaultGroup.id
     except Exception:
@@ -1092,6 +1093,7 @@ def my_account(request, action=None, conn=None, **kwargs):
     context = {
         "form": form,
         "ldapAuth": isLdapUser,
+        "isSudo": isSudo,
         "experimenter": experimenter,
         "ownedGroups": ownedGroups,
         "password_form": password_form,