Merge branch 'release/v1.6.0-2'

Author: CloudFlo2312

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.6.0-2] - 2022-04-29
+
+### Fixed
+- Fixed a bug where the pwd-reset checkbox was checked without any effect (#55)
+
 ## [v1.6.0-1] - 2022-04-27
 Note: CAS version >= 6.5.3-2 is required for this version.
 

Dockerfile

@@ -8,7 +8,7 @@ RUN set -x \
 FROM registry.cloudogu.com/official/java:8u302-1
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.6.0-1" \
+   VERSION="1.6.0-2" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.6.0-1
+VERSION=1.6.0-2
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

app/src/main/webapp/scripts/users/controllers.js

@@ -117,10 +117,8 @@ angular.module('universeadm.users.controllers', ['ui.bootstrap', 'universeadm.va
             return !$scope.create && $scope.user.pwdReset;
         }
 
-
-        $scope.checkPwdResetCheckbox = false;
         passwordResetHandlingService.getPasswordResetDefaultValue().then(function (pwdReset) {
-            $scope.checkPwdResetCheckbox = isEditUserAndUserMustPwdReset() || ($scope.create && pwdReset);
+            $scope.user.pwdReset = isEditUserAndUserMustPwdReset() || ($scope.create && pwdReset);
         });
 
         $scope.containsIllegalChar = function (username) {

app/src/main/webapp/views/user/edit.html

@@ -101,7 +101,7 @@ <h1>{{create ? 'New user' : 'Account'}}</h1>
         </strong>
       </div>
       <div class="form-group" ng-hide="userIsCurrentUser">
-          <input id="pwdResetAtFirstLogin" name="pwdReset" type="checkbox" ng-checked="checkPwdResetCheckbox" class="form-control" placeholder="Reset Password at initial login" ng-model="user.pwdReset">
+          <input id="pwdResetAtFirstLogin" name="pwdReset" type="checkbox" ng-checked="user.pwdReset" class="form-control" placeholder="Reset Password at initial login" ng-model="user.pwdReset">
           <label>The user must change the password at the next login</label>
       </div>
       <button type="submit" class="btn btn-primary" ng-click="save(user)" ng-disabled="form.$invalid || isUnchanged(user)">

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.6.0-1",
+  "Version": "1.6.0-2",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",