Changeset 7501 for trunk/www/my_base/user/settings.jsp

Timestamp:

Aug 9, 2018, 8:40:57 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2127: Boolean extended properties are not disabled when the restricted-edit is enabled

There was a remaining problem with disabled properties being validated when saving the form. In case of an error there there was no way to fix it.

Also fixes an issue with null values when a property is required by checking the 'false' option.

File:

• trunk/www/my_base/user/settings.jsp (modified) (2 diffs)

trunk/www/my_base/user/settings.jsp

@@ -81 +81 @@
       public Object convert(ExtendedProperty ep)
       {
+        if (ep.isRestrictedEdit()) return null;
         JSONObject json = new JSONObject();
         json.put("name", ep.getName());
@@ -298 +299 @@
                   ><label for="<%=fieldName%>.true">true</label>
                 <input type="radio" <%=isDisabled%> name="<%=fieldName%>" id="<%=fieldName%>.false" value="false" 
-                  <%=b != null && b == false ? "checked" : ""%>
+                  <%=b != null && b == false || required && b == null ? "checked" : ""%>
                   ><label for="<%=fieldName%>.false">false</label>
                 <%