Skip to content

Commit 1c33c0b

Browse files
brianbrixbrianbrix
committed
OCE-546: Remove Makueni text/code occurences
1 parent 74b83d2 commit 1c33c0b

File tree

193 files changed

+998
-1000
lines changed

Some content is hidden

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

193 files changed

+998
-1000
lines changed

‎forms/src/main/java/org/devgateway/toolkit/forms/service/PermissionEntityRenderableService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.devgateway.ocds.forms.wicket.FormSecurityUtil;
55
import org.devgateway.toolkit.forms.wicket.page.edit.roleassignable.EditorValidatorRoleAssignable;
66
import org.devgateway.toolkit.persistence.dao.categories.Department;
7-
import org.devgateway.toolkit.persistence.dao.form.AbstractMakueniEntity;
7+
import org.devgateway.toolkit.persistence.dao.form.AbstractClientEntity;
88
import org.devgateway.toolkit.web.security.SecurityConstants;
99
import org.springframework.stereotype.Service;
1010
import org.springframework.util.Assert;
@@ -24,7 +24,7 @@ public boolean isMatchingRightsOfEntity(EditorValidatorRoleAssignable page, Set<
2424
return !Sets.intersection(roles, page.getCombinedRoles()).isEmpty();
2525
}
2626

27-
public String getAllowedAccess(final EditorValidatorRoleAssignable page, AbstractMakueniEntity entity) {
27+
public String getAllowedAccess(final EditorValidatorRoleAssignable page, AbstractClientEntity entity) {
2828
return getAllowedAccess(page, entity.isNew(), entity.getDepartment());
2929
}
3030

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/ListLockPanel.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.devgateway.toolkit.persistence.dao.Person;
3939
import org.devgateway.toolkit.persistence.dao.form.Lockable;
4040
import org.devgateway.toolkit.persistence.service.PersonService;
41-
import org.devgateway.toolkit.persistence.service.form.MakueniEntityServiceResolver;
41+
import org.devgateway.toolkit.persistence.service.form.ClientEntityServiceResolver;
4242
import org.devgateway.toolkit.web.security.SecurityUtil;
4343
import org.hibernate.proxy.HibernateProxyHelper;
4444

@@ -48,7 +48,7 @@
4848
public class ListLockPanel extends Panel {
4949

5050
@SpringBean
51-
private MakueniEntityServiceResolver makueniEntityServiceResolver;
51+
private ClientEntityServiceResolver clientEntityServiceResolver;
5252

5353
@SpringBean
5454
private PersonService personService;
@@ -156,9 +156,9 @@ public long size() {
156156
private List<? extends Lockable> getLocks() {
157157
if (locks == null) {
158158
if (filterState.getOwner() != null) {
159-
locks = makueniEntityServiceResolver.getAllLocked(filterState.getOwner());
159+
locks = clientEntityServiceResolver.getAllLocked(filterState.getOwner());
160160
} else {
161-
locks = makueniEntityServiceResolver.getAllLocked();
161+
locks = clientEntityServiceResolver.getAllLocked();
162162
}
163163
}
164164
return locks;
@@ -214,7 +214,7 @@ public ActionPanel(final String id, final IModel<Lockable> model) {
214214

215215
@Override
216216
public void onClick(AjaxRequestTarget target) {
217-
makueniEntityServiceResolver.unlock(lockable);
217+
clientEntityServiceResolver.unlock(lockable);
218218
target.add(ListLockPanel.this);
219219
}
220220
};

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/EditAdminSettingsPage.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import de.agilecoders.wicket.extensions.markup.html.bootstrap.ladda.LaddaAjaxButton;
66
import org.apache.wicket.ajax.AjaxRequestTarget;
77
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
8-
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
98
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
109
import org.apache.wicket.markup.html.basic.Label;
1110
import org.apache.wicket.model.ResourceModel;
@@ -25,7 +24,6 @@
2524
import org.wicketstuff.annotation.mount.MountPath;
2625

2726
import java.util.List;
28-
import java.util.Optional;
2927
import java.util.concurrent.ExecutionException;
3028
import java.util.concurrent.Future;
3129

@@ -169,7 +167,7 @@ private void addImportToMongoLink() {
169167

170168
@Override
171169
protected void onSubmit(AjaxRequestTarget target) {
172-
Future<String> stringFuture = importPostgresToMongoJob.importOcdsMakueniToMongo();
170+
Future<String> stringFuture = importPostgresToMongoJob.importOcdsClientToMongo();
173171
try {
174172
stringFuture.get();
175173
} catch (InterruptedException | ExecutionException e) {

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractMakueniEntityPage.html ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractClientEntityPage.html

File renamed without changes.

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractMakueniEntityPage.java ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractClientEntityPage.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.devgateway.toolkit.forms.wicket.page.overview.department.DepartmentOverviewPage;
2525
import org.devgateway.toolkit.forms.wicket.styles.BaseStyles;
2626
import org.devgateway.toolkit.persistence.dao.DBConstants;
27-
import org.devgateway.toolkit.persistence.dao.form.AbstractMakueniEntity;
27+
import org.devgateway.toolkit.persistence.dao.form.AbstractClientEntity;
2828
import org.devgateway.toolkit.persistence.dao.form.TitleAutogeneratable;
29-
import org.devgateway.toolkit.persistence.service.form.AbstractMakueniEntityService;
29+
import org.devgateway.toolkit.persistence.service.form.AbstractClientEntityService;
3030
import org.devgateway.toolkit.web.security.SecurityConstants;
3131
import org.slf4j.Logger;
3232
import org.slf4j.LoggerFactory;
@@ -35,9 +35,9 @@
3535
* @author idobre
3636
* @since 2019-04-02
3737
*/
38-
public abstract class EditAbstractMakueniEntityPage<T extends AbstractMakueniEntity>
38+
public abstract class EditAbstractClientEntityPage<T extends AbstractClientEntity>
3939
extends AbstractEditStatusEntityPage<T> implements EditorValidatorRoleAssignable {
40-
protected static final Logger logger = LoggerFactory.getLogger(EditAbstractMakueniEntityPage.class);
40+
protected static final Logger logger = LoggerFactory.getLogger(EditAbstractClientEntityPage.class);
4141

4242
protected ButtonContentModal revertToDraftModal;
4343

@@ -56,11 +56,11 @@ protected void checkInitParameters() {
5656

5757
}
5858

59-
public EditAbstractMakueniEntityPage() {
59+
public EditAbstractClientEntityPage() {
6060
this(new PageParameters());
6161
}
6262

63-
public EditAbstractMakueniEntityPage(final PageParameters parameters) {
63+
public EditAbstractClientEntityPage(final PageParameters parameters) {
6464
super(parameters);
6565

6666
this.listPageClass = DepartmentOverviewPage.class;
@@ -74,7 +74,7 @@ protected boolean isViewMode() {
7474

7575
@Override
7676
protected void onAfterRevertToDraft(AjaxRequestTarget target) {
77-
// Collection<? extends AbstractMakueniEntity> allChildrenInHierarchy = getJpaService().getAllChildrenInHierarchy(
77+
// Collection<? extends AbstractClientEntity> allChildrenInHierarchy = getJpaService().getAllChildrenInHierarchy(
7878
// editForm.getModelObject());
7979
// allChildrenInHierarchy.stream().filter(c -> !c.getStatus().equals(DRAFT)).forEach(c -> {
8080
// logger.info("Reverting to DRAFT " + c.getClass().getSimpleName());
@@ -85,7 +85,7 @@ protected void onAfterRevertToDraft(AjaxRequestTarget target) {
8585
// comment.setComment(c.getNewStatusComment());
8686
// c.getStatusComments().add(comment);
8787
// c.setStatus(DRAFT);
88-
// makeniEntityServiceResolver.saveAndFlushMakueniEntity(c);
88+
// makeniEntityServiceResolver.saveAndFlushClientEntity(c);
8989
// });
9090
}
9191

@@ -133,8 +133,8 @@ protected void onBeforeRevertToDraft(AjaxRequestTarget target) {
133133
}
134134

135135

136-
public AbstractMakueniEntityService<T> getJpaService() {
137-
return (AbstractMakueniEntityService<T>) jpaService;
136+
public AbstractClientEntityService<T> getJpaService() {
137+
return (AbstractClientEntityService<T>) jpaService;
138138
}
139139

140140
@Override

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractMakueniEntityPage.properties ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractClientEntityPage.properties

File renamed without changes.

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractImplTenderProcessEntityPage.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import org.apache.wicket.markup.html.panel.Fragment;
44
import org.apache.wicket.request.mapper.parameter.PageParameters;
55
import org.devgateway.toolkit.forms.wicket.components.form.GenericSleepFormComponent;
6-
import org.devgateway.toolkit.persistence.dao.form.AbstractImplTenderProcessMakueniEntity;
6+
import org.devgateway.toolkit.persistence.dao.form.AbstractImplTenderProcessClientEntity;
77

88
/**
99
* @author mpostelnicu
1010
*/
11-
public abstract class EditAbstractImplTenderProcessEntityPage<T extends AbstractImplTenderProcessMakueniEntity>
12-
extends EditAbstractTenderProcessMakueniEntityPage<T> {
11+
public abstract class EditAbstractImplTenderProcessEntityPage<T extends AbstractImplTenderProcessClientEntity>
12+
extends EditAbstractTenderProcessClientEntityPage<T> {
1313

1414
protected Fragment abstractImplExtraFields;
1515

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderProcessMakueniEntityPage.html ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderProcessClientEntityPage.html

File renamed without changes.

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderProcessMakueniEntityPage.java ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderProcessClientEntityPage.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.devgateway.toolkit.forms.wicket.page.overview.status.StatusOverviewPage;
2020
import org.devgateway.toolkit.persistence.dao.DBConstants;
2121
import org.devgateway.toolkit.persistence.dao.categories.Department;
22-
import org.devgateway.toolkit.persistence.dao.form.AbstractMakueniEntity;
23-
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessMakueniEntity;
22+
import org.devgateway.toolkit.persistence.dao.form.AbstractClientEntity;
23+
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessClientEntity;
2424
import org.devgateway.toolkit.persistence.dao.form.AwardAcceptance;
2525
import org.devgateway.toolkit.persistence.dao.form.AwardNotification;
2626
import org.devgateway.toolkit.persistence.dao.form.Contract;
@@ -42,9 +42,9 @@
4242
/**
4343
* @author mihai
4444
*/
45-
public abstract class EditAbstractTenderProcessMakueniEntityPage<T extends AbstractTenderProcessMakueniEntity>
46-
extends EditAbstractMakueniEntityPage<T> {
47-
protected static final Logger logger = LoggerFactory.getLogger(EditAbstractTenderProcessMakueniEntityPage.class);
45+
public abstract class EditAbstractTenderProcessClientEntityPage<T extends AbstractTenderProcessClientEntity>
46+
extends EditAbstractClientEntityPage<T> {
47+
protected static final Logger logger = LoggerFactory.getLogger(EditAbstractTenderProcessClientEntityPage.class);
4848

4949
public static final Map<Class<?>, Class<? extends Page>> PAGE_CLASS_BY_FORM_CLASS =
5050
ImmutableMap.<Class<?>, Class<? extends Page>>builder()
@@ -60,7 +60,7 @@ public abstract class EditAbstractTenderProcessMakueniEntityPage<T extends Abstr
6060
@SpringBean
6161
private TenderProcessService tenderProcessService;
6262

63-
public EditAbstractTenderProcessMakueniEntityPage(final PageParameters parameters) {
63+
public EditAbstractTenderProcessClientEntityPage(final PageParameters parameters) {
6464
super(parameters);
6565

6666
final Fragment fragment = new Fragment("extraReadOnlyFields", "noExtraReadOnlyFields", this);
@@ -202,7 +202,7 @@ protected Class<? extends Page> pageAfterSubmitAndNext() {
202202
@Override
203203
protected PageParameters parametersAfterSubmitAndNext() {
204204
final PageParameters pp = new PageParameters();
205-
AbstractMakueniEntity nextStatusable = tenderProcessService.getNextStatusable(
205+
AbstractClientEntity nextStatusable = tenderProcessService.getNextStatusable(
206206
editForm.getModelObject().getTenderProcess(), editForm.getModelObject().getClass());
207207
if (!ObjectUtils.isEmpty(nextStatusable)) {
208208
pp.set(WebConstants.PARAM_ID, nextStatusable.getId());

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderProcessMakueniEntityPage.properties ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderProcessClientEntityPage.properties

File renamed without changes.

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderReqMakueniEntityPage.java ‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAbstractTenderReqClientEntityPage.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
import org.apache.wicket.model.IModel;
44
import org.apache.wicket.request.mapper.parameter.PageParameters;
55
import org.devgateway.toolkit.forms.wicket.components.form.GenericSleepFormComponent;
6-
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessMakueniEntity;
6+
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessClientEntity;
77
import org.devgateway.toolkit.persistence.spring.PersistenceUtil;
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

1111
/**
1212
* @author mihai
1313
*/
14-
public abstract class EditAbstractTenderReqMakueniEntityPage<T extends AbstractTenderProcessMakueniEntity>
15-
extends EditAbstractTenderProcessMakueniEntityPage<T> {
16-
protected static final Logger logger = LoggerFactory.getLogger(EditAbstractTenderReqMakueniEntityPage.class);
14+
public abstract class EditAbstractTenderReqClientEntityPage<T extends AbstractTenderProcessClientEntity>
15+
extends EditAbstractTenderProcessClientEntityPage<T> {
16+
protected static final Logger logger = LoggerFactory.getLogger(EditAbstractTenderReqClientEntityPage.class);
1717

1818
protected GenericSleepFormComponent<String> tenderTitle;
1919

2020
protected GenericSleepFormComponent<String> tenderNumber;
2121

22-
public EditAbstractTenderReqMakueniEntityPage(final PageParameters parameters) {
22+
public EditAbstractTenderReqClientEntityPage(final PageParameters parameters) {
2323
super(parameters);
2424
}
2525

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAwardAcceptancePage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
2424
@MountPath
25-
public class EditAwardAcceptancePage extends EditAbstractTenderReqMakueniEntityPage<AwardAcceptance>
25+
public class EditAwardAcceptancePage extends EditAbstractTenderReqClientEntityPage<AwardAcceptance>
2626
implements ProcurementRoleAssignable {
2727
@SpringBean
2828
protected AwardAcceptanceService awardAcceptanceService;

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditAwardNotificationPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
1818
@MountPath
19-
public class EditAwardNotificationPage extends EditAbstractTenderReqMakueniEntityPage<AwardNotification>
19+
public class EditAwardNotificationPage extends EditAbstractTenderReqClientEntityPage<AwardNotification>
2020
implements ProcurementRoleAssignable {
2121
@SpringBean
2222
protected AwardNotificationService awardNotificationService;

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditContractPage.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.devgateway.toolkit.persistence.dao.categories.Supplier;
2727
import org.devgateway.toolkit.persistence.dao.categories.TargetGroup;
2828
import org.devgateway.toolkit.persistence.dao.categories.Ward;
29-
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessMakueniEntity;
29+
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessClientEntity;
3030
import org.devgateway.toolkit.persistence.dao.form.AwardAcceptanceItem;
3131
import org.devgateway.toolkit.persistence.dao.form.AwardNotificationItem;
3232
import org.devgateway.toolkit.persistence.dao.form.Contract;
@@ -49,7 +49,7 @@
4949
*/
5050
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
5151
@MountPath
52-
public class EditContractPage extends EditAbstractTenderReqMakueniEntityPage<Contract> implements
52+
public class EditContractPage extends EditAbstractTenderReqClientEntityPage<Contract> implements
5353
ProcurementRoleAssignable {
5454
@SpringBean
5555
protected ContractService contractService;
@@ -162,7 +162,7 @@ public static List<Supplier> getAcceptedSupplier(TenderProcess tenderProcess) {
162162
private void addSupplierInfo() {
163163
awardeeSelector = new Select2ChoiceBootstrapFormComponent<>("awardee",
164164
new EntityListChoiceProvider<>(editForm.getModel()
165-
.map(AbstractTenderProcessMakueniEntity::getTenderProcess)
165+
.map(AbstractTenderProcessClientEntity::getTenderProcess)
166166
.map(EditContractPage::getAcceptedSupplier)));
167167
awardeeSelector.setEnabled(!editForm.getModelObject().getTenderProcess().hasNonDraftImplForms());
168168
awardeeSelector.getField().add(new AwardeeAjaxComponentUpdatingBehavior());

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditPaymentVoucherPage.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.devgateway.toolkit.forms.wicket.page.edit.roleassignable.MEPaymentRoleAssignable;
1111
import org.devgateway.toolkit.forms.wicket.providers.GenericChoiceProvider;
1212
import org.devgateway.toolkit.persistence.dao.DBConstants;
13-
import org.devgateway.toolkit.persistence.dao.form.AbstractImplTenderProcessMakueniEntity;
13+
import org.devgateway.toolkit.persistence.dao.form.AbstractImplTenderProcessClientEntity;
1414
import org.devgateway.toolkit.persistence.dao.form.PaymentVoucher;
15-
import org.devgateway.toolkit.persistence.service.form.AbstractMakueniEntityService;
15+
import org.devgateway.toolkit.persistence.service.form.AbstractClientEntityService;
1616
import org.devgateway.toolkit.persistence.service.form.AdministratorReportService;
1717
import org.devgateway.toolkit.persistence.service.form.InspectionReportService;
1818
import org.devgateway.toolkit.persistence.service.form.PMCReportService;
@@ -99,8 +99,8 @@ protected void setButtonsPermissions() {
9999
saveTerminateButton.setVisibilityAllowed(false);
100100
}
101101

102-
private <X extends AbstractImplTenderProcessMakueniEntity> GenericChoiceProvider<X>
103-
submittedAndWithinTenderProcessProvider(AbstractMakueniEntityService<X> service) {
102+
private <X extends AbstractImplTenderProcessClientEntity> GenericChoiceProvider<X>
103+
submittedAndWithinTenderProcessProvider(AbstractClientEntityService<X> service) {
104104
return new GenericChoiceProvider<>(service.findAll().stream().filter(x ->
105105
(x.getStatus().equals(DBConstants.Status.SUBMITTED)
106106
|| x.getStatus().equals(DBConstants.Status.APPROVED))

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditProcurementPlanPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
2424
@MountPath
25-
public class EditProcurementPlanPage extends EditAbstractMakueniEntityPage<ProcurementPlan>
25+
public class EditProcurementPlanPage extends EditAbstractClientEntityPage<ProcurementPlan>
2626
implements ProcurementRoleAssignable {
2727
@SpringBean
2828
protected ProcurementPlanService procurementPlanService;

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditProfessionalOpinionPage.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.devgateway.toolkit.forms.wicket.components.form.GenericSleepFormComponent;
99
import org.devgateway.toolkit.forms.wicket.page.edit.panel.ProfessionalOpinionItemPanel;
1010
import org.devgateway.toolkit.forms.wicket.page.edit.roleassignable.ProcurementRoleAssignable;
11-
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessMakueniEntity;
11+
import org.devgateway.toolkit.persistence.dao.form.AbstractTenderProcessClientEntity;
1212
import org.devgateway.toolkit.persistence.dao.form.ProfessionalOpinion;
1313
import org.devgateway.toolkit.persistence.dao.form.Tender;
1414
import org.devgateway.toolkit.persistence.dao.form.TenderProcess;
@@ -23,7 +23,7 @@
2323
*/
2424
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
2525
@MountPath
26-
public class EditProfessionalOpinionPage extends EditAbstractTenderProcessMakueniEntityPage<ProfessionalOpinion>
26+
public class EditProfessionalOpinionPage extends EditAbstractTenderProcessClientEntityPage<ProfessionalOpinion>
2727
implements ProcurementRoleAssignable {
2828
@SpringBean
2929
protected ProfessionalOpinionService professionalOpinionService;
@@ -48,7 +48,7 @@ protected void onInitialize() {
4848

4949
Fragment extraFields = new Fragment("extraReadOnlyFields", "extraReadOnlyFields", this);
5050
IModel<Tender> tenderModel = editForm.getModel()
51-
.map(AbstractTenderProcessMakueniEntity::getTenderProcess)
51+
.map(AbstractTenderProcessClientEntity::getTenderProcess)
5252
.map(TenderProcess::getSingleTender);
5353
extraFields.add(new GenericSleepFormComponent<>("tenderNumber",
5454
tenderModel.map(Tender::getTenderNumber)));

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditProjectPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
*/
5050
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
5151
@MountPath
52-
public class EditProjectPage extends EditAbstractMakueniEntityPage<Project>
52+
public class EditProjectPage extends EditAbstractClientEntityPage<Project>
5353
implements ProcurementRoleAssignable {
5454
@SpringBean
5555
protected ProjectService projectService;

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditPurchaseRequisitionGroupPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
2222
@MountPath("/purchaseRequisition")
2323
public class EditPurchaseRequisitionGroupPage
24-
extends EditAbstractTenderProcessMakueniEntityPage<PurchaseRequisitionGroup>
24+
extends EditAbstractTenderProcessClientEntityPage<PurchaseRequisitionGroup>
2525
implements ProcurementRoleAssignable {
2626
@SpringBean
2727
private PurchaseRequisitionGroupService purchaseRequisitionGroupService;

‎forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/form/EditTenderPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
*/
5757
@AuthorizeInstantiation(SecurityConstants.Roles.ROLE_USER)
5858
@MountPath
59-
public class EditTenderPage extends EditAbstractTenderProcessMakueniEntityPage<Tender>
59+
public class EditTenderPage extends EditAbstractTenderProcessClientEntityPage<Tender>
6060
implements ProcurementRoleAssignable {
6161

6262
@SpringBean

0 commit comments

Comments
 (0)