Revision 8b853f4a
Added by Andreas Kohlbecker over 2 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java | ||
|---|---|---|
| 152 | 152 |
labelText += " <strong>" + typeStatus.getLabel() + (typeDesignationWorkingSet.getTypeDesignations().size() > 1 ? "s":"" ) + "</strong>: "; |
| 153 | 153 |
boolean isFirst = true; |
| 154 | 154 |
for(TypeDesignationDTO<?> dtDTO : typeDesignationWorkingSet.getTypeDesignations()) {
|
| 155 |
labelText += ( isFirst ? "" : ", ") + TaggedCacheHelper.createString(dtDTO.getTaggedText(), EnumSet.of(TagEnum.reference, TagEnum.separator)); // TagEnum.separator removes "designated By" |
|
| 155 |
labelText += ( isFirst ? "" : ", ") + TaggedCacheHelper.createString( |
|
| 156 |
TaggedCacheHelper.cropAt(dtDTO.getTaggedText(), TagEnum.separator, "designated\s+[bB]y")); |
|
| 156 | 157 |
isFirst = false; |
| 157 | 158 |
} |
| 158 |
|
|
| 159 | 159 |
} |
| 160 | 160 |
|
| 161 | 161 |
Label label = new Label(labelText, ContentMode.HTML); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/LoginPresenter.java | ||
|---|---|---|
| 135 | 135 |
redirectToState = String.join("/", redirectToStateTokens);
|
| 136 | 136 |
} |
| 137 | 137 |
|
| 138 |
// attempt to auto login |
|
| 139 |
if(StringUtils.isNotEmpty(System.getProperty(PROPNAME_USER)) && StringUtils.isNotEmpty(System.getProperty(PROPNAME_PASSWORD))){
|
|
| 140 |
log.warn("Performing autologin with user " + System.getProperty(PROPNAME_USER));
|
|
| 141 |
authenticate(System.getProperty(PROPNAME_USER), System.getProperty(PROPNAME_PASSWORD)); |
|
| 142 |
} |
|
| 143 |
|
|
| 144 | 138 |
getView().getLoginDialog().getEmail().addValidator(new AbstractStringValidator("An account for this email address already exits. You may want to use the \"Password Revovery\" tab intsead?") {
|
| 145 | 139 |
private static final long serialVersionUID = 1L; |
| 146 | 140 |
@Override |
| ... | ... | |
| 148 | 142 |
return !repo.getAccountRegistrationService().emailAddressExists(value); |
| 149 | 143 |
} |
| 150 | 144 |
}); |
| 145 |
|
|
| 146 |
// attempt to auto login |
|
| 147 |
if(StringUtils.isNotEmpty(System.getProperty(PROPNAME_USER)) && StringUtils.isNotEmpty(System.getProperty(PROPNAME_PASSWORD))){
|
|
| 148 |
log.warn("Performing autologin with user " + System.getProperty(PROPNAME_USER));
|
|
| 149 |
authenticate(System.getProperty(PROPNAME_USER), System.getProperty(PROPNAME_PASSWORD)); |
|
| 150 |
} |
|
| 151 |
|
|
| 151 | 152 |
} |
| 152 | 153 |
|
| 153 | 154 |
@Override |
Also available in: Unified diff
ref #9878 restoring media type source citations by making use of tagged text cropping