Revision ee7eb9e7
Added by Andreas Kohlbecker over 5 years ago
| src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkingSetService.java | ||
|---|---|---|
| 53 | 53 |
public class RegistrationWorkingSetService implements IRegistrationWorkingSetService {
|
| 54 | 54 |
|
| 55 | 55 |
public static final List<String> REGISTRATION_INIT_STRATEGY = Arrays.asList(new String []{
|
| 56 |
"blockedBy", |
|
| 56 | 57 |
// typeDesignation |
| 57 | 58 |
"typeDesignations.typeStatus", |
| 58 | 59 |
"typeDesignations.typifiedNames.typeDesignations", // important !! |
| src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItem.java | ||
|---|---|---|
| 245 | 245 |
getMessageButton().setCaptionAsHtml(true); |
| 246 | 246 |
} |
| 247 | 247 |
|
| 248 |
if(regDto != null && regDto.getBlockedBy() != null && regDto.getBlockedBy().size() > 0){
|
|
| 249 |
getBlockedByButton().setEnabled(true); |
|
| 250 |
getBlockedByButton().addStyleName("blocked");
|
|
| 251 |
} |
|
| 252 |
|
|
| 248 | 253 |
labelMarkup.append(citationString); |
| 249 | 254 |
|
| 250 | 255 |
if(openButtonEvent != null){
|
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationDTO.java | ||
|---|---|---|
| 58 | 58 |
|
| 59 | 59 |
private List<String> messages = new ArrayList<>(); |
| 60 | 60 |
|
| 61 |
private Set<eu.etaxonomy.cdm.model.name.Registration> blockedBy = new HashSet<>(); |
|
| 61 |
// private Set<eu.etaxonomy.cdm.model.name.Registration> blockedBy = new HashSet<>();
|
|
| 62 | 62 |
|
| 63 | 63 |
|
| 64 | 64 |
/** |
| ... | ... | |
| 363 | 363 |
* @return the blockedBy |
| 364 | 364 |
*/ |
| 365 | 365 |
public Set<Registration> getBlockedBy() {
|
| 366 |
return blockedBy;
|
|
| 366 |
return reg.getBlockedBy();
|
|
| 367 | 367 |
} |
| 368 | 368 |
|
| 369 | 369 |
/** |
| src/main/webapp/VAADIN/themes/edit-valo/edit-valo.scss | ||
|---|---|---|
| 242 | 242 |
} |
| 243 | 243 |
} |
| 244 | 244 |
|
| 245 |
|
|
| 246 |
// --------------------------------------------------- // |
|
| 247 |
|
|
| 248 |
.registration-list-item {
|
|
| 249 |
.blocked {
|
|
| 250 |
color: $v-focus-color; |
|
| 251 |
} |
|
| 252 |
} |
|
| 253 |
|
|
| 245 | 254 |
// --------------------------------------------------- // |
| 246 | 255 |
|
| 247 | 256 |
#workingset {
|
Also available in: Unified diff
ref #7195 enabling and highlighting blockedBy button