Revision 4cfb3625
Added by Fabian Reimeier over 5 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/component/DistributionToolbar.java | ||
|---|---|---|
| 12 | 12 |
import com.vaadin.server.FontAwesome; |
| 13 | 13 |
import com.vaadin.server.ThemeResource; |
| 14 | 14 |
import com.vaadin.spring.annotation.SpringComponent; |
| 15 |
import com.vaadin.spring.annotation.UIScope;
|
|
| 15 |
import com.vaadin.spring.annotation.ViewScope;
|
|
| 16 | 16 |
import com.vaadin.ui.Alignment; |
| 17 | 17 |
import com.vaadin.ui.Button; |
| 18 | 18 |
import com.vaadin.ui.HorizontalLayout; |
| ... | ... | |
| 24 | 24 |
import eu.etaxonomy.vaadin.ui.navigation.NavigationManager; |
| 25 | 25 |
|
| 26 | 26 |
@SpringComponent("distributionToolbar")
|
| 27 |
@UIScope
|
|
| 27 |
@ViewScope
|
|
| 28 | 28 |
public class DistributionToolbar extends HorizontalLayout implements Serializable{
|
| 29 | 29 |
|
| 30 | 30 |
/** |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java | ||
|---|---|---|
| 45 | 45 |
import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer; |
| 46 | 46 |
import eu.etaxonomy.cdm.vaadin.container.PresenceAbsenceTermContainer; |
| 47 | 47 |
import eu.etaxonomy.cdm.vaadin.security.AccessRestrictedView; |
| 48 |
import eu.etaxonomy.cdm.vaadin.security.UserHelper; |
|
| 49 | 48 |
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory; |
| 50 | 49 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
| 51 | 50 |
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; |
| ... | ... | |
| 317 | 316 |
*/ |
| 318 | 317 |
@Override |
| 319 | 318 |
protected void initContent() {
|
| 320 |
/* |
|
| 321 |
* This method is called twice. One time before and one time after login. |
|
| 322 |
* Initializing the layout and click listeners twice is unnecessary and produces |
|
| 323 |
* strange behavior (e.g. one click on settings-button opens settings-window several times), |
|
| 324 |
* so we check for user authentication first. |
|
| 325 |
*/ |
|
| 326 |
if(UserHelper.fromSession().userIsAutheticated() && !UserHelper.fromSession().userIsAnnonymous()) {
|
|
| 327 |
AbsoluteLayout mainLayout = initLayout(); |
|
| 328 |
setCompositionRoot(mainLayout); |
|
| 329 |
createEditClickListener(); |
|
| 330 |
} |
|
| 319 |
AbsoluteLayout mainLayout = initLayout(); |
|
| 320 |
setCompositionRoot(mainLayout); |
|
| 321 |
createEditClickListener(); |
|
| 331 | 322 |
} |
| 332 | 323 |
} |
Also available in: Unified diff
ref #6903 put distribution toolbar in view scope