Skip to content

Commit 74bb900

Browse files
carlosjepardhmiguim
authored andcommitted
Fixed Disposal confirmation ui
1 parent ae8f25b commit 74bb900

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

roda-ui/roda-wui/src/main/java/org/roda/wui/client/disposal/DisposalConfirmations.java

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
import org.roda.core.data.v2.disposal.confirmation.DisposalConfirmation;
1313
import org.roda.wui.client.common.UserLogin;
1414
import org.roda.wui.client.common.actions.DisposalConfirmationActions;
15-
import org.roda.wui.client.common.actions.model.ActionableObject;
16-
import org.roda.wui.client.common.actions.widgets.ActionableWidgetBuilder;
1715
import org.roda.wui.client.common.lists.DisposalConfirmationList;
1816
import org.roda.wui.client.common.lists.utils.AsyncTableCellOptions;
1917
import org.roda.wui.client.common.lists.utils.ListBuilder;
2018
import org.roda.wui.client.common.search.SearchWrapper;
21-
import org.roda.wui.client.common.utils.SidebarUtils;
2219
import org.roda.wui.client.disposal.confirmations.CreateDisposalConfirmation;
2320
import org.roda.wui.client.disposal.confirmations.ShowDisposalConfirmation;
2421
import org.roda.wui.common.client.HistoryResolver;
@@ -31,7 +28,6 @@
3128
import com.google.gwt.user.client.rpc.AsyncCallback;
3229
import com.google.gwt.user.client.ui.Composite;
3330
import com.google.gwt.user.client.ui.FlowPanel;
34-
import com.google.gwt.user.client.ui.SimplePanel;
3531
import com.google.gwt.user.client.ui.Widget;
3632

3733
import config.i18n.client.ClientMessages;
@@ -69,31 +65,21 @@ public String getHistoryToken() {
6965
FlowPanel disposalConfirmationDescription;
7066
@UiField(provided = true)
7167
SearchWrapper searchWrapper;
72-
@UiField
73-
SimplePanel actionsSidebar;
74-
@UiField
75-
FlowPanel contentFlowPanel;
76-
@UiField
77-
FlowPanel sidebarFlowPanel;
7868

7969
/**
8070
* Create a disposal confirmation page
8171
*/
8272
public DisposalConfirmations() {
73+
74+
final DisposalConfirmationActions confirmationActions = DisposalConfirmationActions.get();
75+
8376
ListBuilder<DisposalConfirmation> disposalConfirmationListBuilder = new ListBuilder<>(
8477
() -> new DisposalConfirmationList(),
85-
new AsyncTableCellOptions<>(DisposalConfirmation.class, "Disposal_confirmations").bindOpener()
78+
new AsyncTableCellOptions<>(DisposalConfirmation.class, "Disposal_confirmations").bindOpener().withActionable(confirmationActions)
8679
.withAutoUpdate(5000));
8780

8881
searchWrapper = new SearchWrapper(false).createListAndSearchPanel(disposalConfirmationListBuilder);
89-
9082
initWidget(uiBinder.createAndBindUi(this));
91-
92-
final DisposalConfirmationActions confirmationActions = DisposalConfirmationActions.get();
93-
SidebarUtils.toggleSidebar(contentFlowPanel, sidebarFlowPanel, confirmationActions.hasAnyRoles());
94-
actionsSidebar.setWidget(new ActionableWidgetBuilder<>(confirmationActions)
95-
.buildListWithObjects(new ActionableObject<>(DisposalConfirmation.class)));
96-
9783
disposalConfirmationDescription.add(new HTMLWidgetWrapper("DisposalConfirmationDescription.html"));
9884
}
9985

roda-ui/roda-wui/src/main/java/org/roda/wui/client/disposal/DisposalConfirmations.ui.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@
77

88
<g:FlowPanel styleName="wui-disposal-confirmation" addStyleNames="wrapper skip_padding">
99
<g:FlowPanel addStyleNames="row full_width skip_padding">
10-
<g:FlowPanel addStyleNames="col_10 content" ui:field="contentFlowPanel">
10+
<g:FlowPanel addStyleNames="content" ui:field="contentFlowPanel">
1111
<common:TitlePanel text="{messages.disposalConfirmationsTitle}" iconClass="DisposalConfirmations" />
1212
<g:FlowPanel addStyleNames="page-description" ui:field="disposalConfirmationDescription" />
1313
<commonsearch:SearchWrapper ui:field="searchWrapper" />
1414
</g:FlowPanel>
15-
16-
<g:FlowPanel addStyleNames="col_2 last sidebar" ui:field="sidebarFlowPanel">
17-
<g:FlowPanel addStyleNames="sticky-flow">
18-
<g:FlowPanel addStyleNames="sticky-padding">
19-
<g:SimplePanel addStyleNames="sidebar-group" ui:field="actionsSidebar" />
20-
</g:FlowPanel>
21-
</g:FlowPanel>
22-
</g:FlowPanel>
2315
</g:FlowPanel>
2416
</g:FlowPanel>
2517

0 commit comments

Comments
 (0)