Revision 86f09e7b
Added by Andreas Kohlbecker about 5 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListViewBean.java | ||
|---|---|---|
| 31 | 31 |
import com.vaadin.ui.HorizontalLayout; |
| 32 | 32 |
import com.vaadin.ui.Label; |
| 33 | 33 |
import com.vaadin.ui.ListSelect; |
| 34 |
import com.vaadin.ui.NativeSelect; |
|
| 34 | 35 |
import com.vaadin.ui.Notification; |
| 35 | 36 |
import com.vaadin.ui.TextField; |
| 36 | 37 |
import com.vaadin.ui.VerticalLayout; |
| ... | ... | |
| 75 | 76 |
|
| 76 | 77 |
private Label filterInstructionLabel = new Label("Filter the registrations by");
|
| 77 | 78 |
|
| 78 |
private ListSelect registrationStatusFilter = null;
|
|
| 79 |
private NativeSelect registrationStatusFilter = null;
|
|
| 79 | 80 |
|
| 80 |
private ListSelect submitterFilter = null; // must be null, the presenter relies on this
|
|
| 81 |
private NativeSelect submitterFilter = null; // must be null, the presenter relies on this
|
|
| 81 | 82 |
|
| 82 | 83 |
private TextField identifierFilter = new TextFieldNFix("Identifier");
|
| 83 | 84 |
|
| ... | ... | |
| 104 | 105 |
boolean userIsCurator = UserHelperAccess.userHelper().userIs(new RoleProber(RolesAndPermissions.ROLE_CURATION)); |
| 105 | 106 |
boolean userIsAdmin = UserHelperAccess.userHelper().userIsAdmin(); |
| 106 | 107 |
if(userIsCurator || userIsAdmin){
|
| 107 |
submitterFilter = new ListSelect("Submitter");
|
|
| 108 |
submitterFilter.setRows(1); |
|
| 108 |
submitterFilter = new NativeSelect("Submitter");
|
|
| 109 | 109 |
submitterFilter.addValueChangeListener(e -> updateResults(null, null)); |
| 110 | 110 |
toolBar.addComponent(submitterFilter); |
| 111 | 111 |
} |
| 112 | 112 |
|
| 113 | 113 |
if(viewMode.equals(Mode.all)){
|
| 114 |
registrationStatusFilter = new ListSelect("Registration status", Arrays.asList(RegistrationStatus.values()));
|
|
| 114 |
registrationStatusFilter = new NativeSelect("Registration status", Arrays.asList(RegistrationStatus.values()));
|
|
| 115 | 115 |
registrationStatusFilter.setNullSelectionAllowed(true); |
| 116 |
registrationStatusFilter.setRows(1); |
|
| 117 | 116 |
registrationStatusFilter.addValueChangeListener(e -> updateResults(null, null)); |
| 118 | 117 |
toolBar.addComponent(registrationStatusFilter); |
| 119 | 118 |
} |
| 120 | 119 |
|
| 121 |
statusTypeFilter = new ListSelect("Type Status");
|
|
| 120 |
statusTypeFilter = new NativeSelect("Type Status");
|
|
| 122 | 121 |
((ListSelect)statusTypeFilter).setRows(3); |
| 123 | 122 |
statusTypeFilter.setMultiSelect(true); |
| 124 | 123 |
statusTypeFilter.setNullSelectionAllowed(true); |
| ... | ... | |
| 298 | 297 |
* @return the registrationStatusFilter |
| 299 | 298 |
*/ |
| 300 | 299 |
@Override |
| 301 |
public ListSelect getRegistrationStatusFilter() {
|
|
| 300 |
public NativeSelect getRegistrationStatusFilter() {
|
|
| 302 | 301 |
return registrationStatusFilter; |
| 303 | 302 |
} |
| 304 | 303 |
|
| ... | ... | |
| 306 | 305 |
* @return the submitterFilter |
| 307 | 306 |
*/ |
| 308 | 307 |
@Override |
| 309 |
public ListSelect getSubmitterFilter() {
|
|
| 308 |
public NativeSelect getSubmitterFilter() {
|
|
| 310 | 309 |
return submitterFilter; |
| 311 | 310 |
} |
| 312 | 311 |
|
Also available in: Unified diff
fix #8184 using NativeSelect instead of ListSelect to avoid circumvent a bug in the ListSelect which affects the Chrome browser