fixed bytes-error

cmeier76 · Feb 15, 2021 · cfec4d5 · cfec4d5
1 parent cd92012
commit cfec4d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Products/zms/_accessmanager.py b/Products/zms/_accessmanager.py
@@ -720,7 +720,8 @@ def getValidUserids(self, search_term='', search_term_param=None, without_node_c
           uid = plugin.getUserIdForLogin(login_name)
         if uid is not None:
           d['user_id_'] = uid
-          uid = standard.pybytes(uid)
+          if isinstance(uid,str):
+            uid = bytes(uid,'utf-8')
           if uid.startswith(b'\x01\x05\x00\x00'):
             import binascii
             buid = memoryview(uid)

diff --git a/Products/zms/zpt/ZMS/manage_users.zpt b/Products/zms/zpt/ZMS/manage_users.zpt
@@ -268,7 +268,7 @@ function zmiModalInsertUserOpen(context) {
 				</tal:block>
 				<div class="form-group row">
 					<div class="controls save">
-						<button type="submit" name="btn" class="btn btn-primary" value="BTN_SAVE" tal:condition="python:userObj is not None"><i class="fa fa-save"></i> <tal:block tal:content="python:here.getZMILangStr('BTN_SAVE')">Save</tal:block></button>
+						<button type="submit" name="btn" class="btn btn-primary" value="BTN_SAVE" tal:condition="python:userObj is not None"><i class="fas fa-save"></i> <tal:block tal:content="python:here.getZMILangStr('BTN_SAVE')">Save</tal:block></button>
 						<button type="submit" name="btn" class="btn btn-secondary" value="BTN_DELETE" tal:condition="python:userName in userNames"><i class="fas fa-times"></i> <tal:block tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</tal:block></button>
 						&nbsp;&nbsp;
 						<button type="submit" name="btn" class="btn btn-secondary" value="BTN_BACK" tal:content="python:here.getZMILangStr('BTN_BACK')">Back</button>