Skip to content

Commit 9123444

Browse files
committed
Update create/edit disposal schedules, holds and rules to use the new generic form
1 parent 5c21912 commit 9123444

54 files changed

Lines changed: 1242 additions & 2435 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/disposal/rule/DisposalRule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public class DisposalRule implements IsModelObject, IsIndexed, HasId, Comparable
5858

5959
public DisposalRule() {
6060
super();
61+
type = ConditionType.IS_CHILD_OF;
6162
}
6263

6364
@Override

roda-core/roda-core/src/main/java/org/roda/core/model/TransactionalModelService.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,19 @@
77
*/
88
package org.roda.core.model;
99

10+
import org.roda.core.data.exceptions.AuthorizationDeniedException;
11+
import org.roda.core.data.exceptions.GenericException;
12+
import org.roda.core.data.exceptions.NotFoundException;
13+
import org.roda.core.data.exceptions.RequestNotValidException;
14+
import org.roda.core.data.v2.jobs.Job;
1015
import org.roda.core.transaction.TransactionalService;
1116

1217
/**
1318
* @author Gabriel Barros <gbarros@keep.pt>
1419
*/
1520
public interface TransactionalModelService extends ModelService, TransactionalService {
21+
@Override
22+
default void createOrUpdateJob(Job job) throws RequestNotValidException, GenericException, NotFoundException, AuthorizationDeniedException {
23+
24+
}
1625
}

roda-ui/roda-wui/src/main/java/config/i18n/client/ClientMessages.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2785,4 +2785,8 @@ SafeHtml representationInformationAssociatedWithDescription(String field, String
27852785
String failedToUpdateGroup();
27862786

27872787
String failedToUpdateUser();
2788+
2789+
String disposalScheduleSuccessfullyCreated();
2790+
2791+
String disposalScheduleSuccessfullyUpdated();
27882792
}

roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/tabs/DisposalPolicyTabs.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
package org.roda.wui.client.browse.tabs;
22

3+
import java.util.List;
4+
35
import org.roda.core.data.common.RodaConstants;
46
import org.roda.core.data.v2.disposal.hold.DisposalHold;
5-
import org.roda.core.data.v2.disposal.schedule.DisposalSchedule;
67
import org.roda.core.data.v2.disposal.rule.DisposalRule;
8+
import org.roda.core.data.v2.disposal.schedule.DisposalSchedule;
79
import org.roda.wui.client.common.actions.DisposalHoldSearchWrapperActions;
810
import org.roda.wui.client.common.actions.DisposalRuleAction;
911
import org.roda.wui.client.common.actions.DisposalRuleSearchWrapperActions;
1012
import org.roda.wui.client.common.actions.DisposalScheduleSearchWrapperActions;
11-
import org.roda.wui.client.common.lists.DisposalScheduleList;
1213
import org.roda.wui.client.common.lists.DisposalHoldList;
1314
import org.roda.wui.client.common.lists.DisposalRuleList;
15+
import org.roda.wui.client.common.lists.DisposalScheduleList;
1416
import org.roda.wui.client.common.lists.utils.AsyncTableCellOptions;
1517
import org.roda.wui.client.common.lists.utils.ListBuilder;
1618
import org.roda.wui.client.common.search.SearchWrapper;
1719
import org.roda.wui.client.common.utils.PermissionClientUtils;
1820

1921
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
2022
import com.google.gwt.user.client.ui.Widget;
21-
import com.google.gwt.storage.client.Storage;
22-
23-
import java.util.List;
2423

2524
public class DisposalPolicyTabs extends Tabs {
2625

@@ -56,7 +55,7 @@ public Widget buildTabWidget() {
5655
if (PermissionClientUtils.hasPermissions(RodaConstants.PERMISSION_METHOD_LIST_DISPOSAL_RULES)) {
5756
ListBuilder<DisposalRule> ruleListBuilder = new ListBuilder<>(() -> new DisposalRuleList(),
5857
new AsyncTableCellOptions<>(DisposalRule.class, "DisposalPolicyPage_disposalRules")
59-
.withActionable(DisposalRuleSearchWrapperActions.get()).withActionBlacklist(List.of(DisposalRuleAction.SAVE, DisposalRuleAction.UPDATE))
58+
.withActionable(DisposalRuleSearchWrapperActions.get())
6059
.withCsvDownloadButtonVisibility(false).bindOpener());
6160

6261
createAndAddTab(SafeHtmlUtils.fromSafeConstant(messages.disposalRulesTitle()), new TabContentBuilder() {

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/BrowseObjectActionsToolbar.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ public void setObjectAndBuild(T object, Permissions permissions,
5252
buildActions();
5353
}
5454

55-
public void setDataPanel(GenericDataPanel<T> dataPanel) {
56-
this.dataPanel = dataPanel;
57-
}
58-
59-
public GenericDataPanel<T> getDataPanel() {
60-
return this.dataPanel;
61-
}
62-
6355
protected abstract void buildIcon();
6456

6557
protected abstract void buildTags();

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/CreateOrUpdateDisposalHoldActionsToolbar.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/CreateOrUpdateDisposalRuleActionsToolbar.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/CreateOrUpdateDisposalScheduleActionsToolbar.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)