James Moger
2013-07-17 34d1fdb4fe85d1297b7160fcce824a552031daae
Fixed bug with adding new local users with external authentication
2 files modified
14 ■■■■■ changed files
releases.moxie 3 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/GitBlit.java 11 ●●●● patch | view | raw | blame | history
releases.moxie
@@ -14,8 +14,9 @@
    - Fixed missing model class dependencies in Gitblit Manager build
    - Fix for IE10 compatability mode
    - Reset dashboard and activity commit cache on branch REWIND or DELETE
    - Fixed bug with adding new local users with external authentication
    changes:
    - updated Chinese translation
    - updated Chinese translation
    additions: ~
    dependencyChanges: ~
    contributors:
src/main/java/com/gitblit/GitBlit.java
@@ -84,6 +84,7 @@
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AccountType;
import com.gitblit.Constants.AuthenticationType;
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.FederationRequest;
@@ -695,12 +696,12 @@
    public boolean supportsCredentialChanges(UserModel user) {
        if (user == null) {
            return false;
        } else if (!Constants.EXTERNAL_ACCOUNT.equals(user.password)) {
            // credentials likely maintained by Gitblit
            return userService.supportsCredentialChanges();
        } else if (AccountType.LOCAL.equals(user.accountType)) {
            // local account, we can change credentials
            return true;
        } else {
            // credentials are externally maintained
            return false;
            // external account, ask user service
            return userService.supportsCredentialChanges();
        }
    }