Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java

@@ -43,7 +43,6 @@
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
import com.gitblit.GitBlit;
import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.UserModel;
import com.gitblit.utils.DeepCopier;
@@ -140,13 +139,13 @@
            } else if (RegistrantType.USER.equals(entry.registrantType)) {
               // user
               PersonIdent ident = new PersonIdent(entry.registrant, "");
               UserModel user = GitBlit.self().getUserModel(entry.registrant);
               UserModel user = app().users().getUserModel(entry.registrant);
               if (user != null) {
                  ident = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
               }

               Fragment userFragment = new Fragment("registrant", "userRegistrant", RegistrantPermissionsPanel.this);
               userFragment.add(new GravatarImage("userAvatar", ident, 20, false));
               userFragment.add(new AvatarImage("userAvatar", ident, 20));
               userFragment.add(new Label("userName", entry.registrant));
               item.add(userFragment);
            } else {
@@ -261,6 +260,9 @@
            if (rp.permission == null) {
               return;
            }
            if (rp.registrant == null) {
               return;
            }
            RegistrantAccessPermission copy = DeepCopier.copy(rp);
            if (StringUtils.findInvalidCharacter(copy.registrant) != null) {
               copy.permissionType = PermissionType.REGEX;