-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #341 from devgateway/feature/OCMAKU-370
OCMAKU-370 Make the department field optional in the staff meta data …
- Loading branch information
Showing
1 changed file
with
47 additions
and
47 deletions.
There are no files selected for viewing
94 changes: 47 additions & 47 deletions
94
...s/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/category/EditStaffPage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,47 @@ | ||
| /** | ||
| * | ||
| */ | ||
| package org.devgateway.toolkit.forms.wicket.page.edit.category; | ||
|
|
||
| import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; | ||
| import org.apache.wicket.request.mapper.parameter.PageParameters; | ||
| import org.apache.wicket.spring.injection.annot.SpringBean; | ||
| import org.devgateway.toolkit.forms.WebConstants; | ||
| import org.devgateway.toolkit.forms.wicket.components.form.TextFieldBootstrapFormComponent; | ||
| import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil; | ||
| import org.devgateway.toolkit.forms.wicket.page.lists.category.ListStaffPage; | ||
| import org.devgateway.toolkit.persistence.dao.categories.Staff; | ||
| import org.devgateway.toolkit.persistence.service.category.DepartmentService; | ||
| import org.devgateway.toolkit.persistence.service.category.StaffService; | ||
| import org.devgateway.toolkit.web.security.SecurityConstants; | ||
| import org.wicketstuff.annotation.mount.MountPath; | ||
|
|
||
| /** | ||
| * @author gmutuhu | ||
| * | ||
| */ | ||
| @AuthorizeInstantiation(SecurityConstants.Roles.ROLE_ADMIN) | ||
| @MountPath("/staff") | ||
| public class EditStaffPage extends AbstractCategoryEditPage<Staff> { | ||
| @SpringBean | ||
| private StaffService staffService; | ||
|
|
||
| @SpringBean | ||
| private DepartmentService departmentService; | ||
|
|
||
| public EditStaffPage(final PageParameters parameters) { | ||
| super(parameters); | ||
| jpaService = staffService; | ||
| listPageClass = ListStaffPage.class; | ||
| } | ||
|
|
||
| @Override | ||
| protected void onInitialize() { | ||
| super.onInitialize(); | ||
|
|
||
| final TextFieldBootstrapFormComponent<String> title = ComponentUtil.addTextField(editForm, "title"); | ||
| title.getField().add(WebConstants.StringValidators.MAXIMUM_LENGTH_VALIDATOR_STD_DEFAULT_TEXT); | ||
| ComponentUtil.addSelect2ChoiceField(editForm, "department", departmentService).required(); | ||
| } | ||
| } | ||
| /** | ||
| * | ||
| */ | ||
| package org.devgateway.toolkit.forms.wicket.page.edit.category; | ||
|
|
||
| import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; | ||
| import org.apache.wicket.request.mapper.parameter.PageParameters; | ||
| import org.apache.wicket.spring.injection.annot.SpringBean; | ||
| import org.devgateway.toolkit.forms.WebConstants; | ||
| import org.devgateway.toolkit.forms.wicket.components.form.TextFieldBootstrapFormComponent; | ||
| import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil; | ||
| import org.devgateway.toolkit.forms.wicket.page.lists.category.ListStaffPage; | ||
| import org.devgateway.toolkit.persistence.dao.categories.Staff; | ||
| import org.devgateway.toolkit.persistence.service.category.DepartmentService; | ||
| import org.devgateway.toolkit.persistence.service.category.StaffService; | ||
| import org.devgateway.toolkit.web.security.SecurityConstants; | ||
| import org.wicketstuff.annotation.mount.MountPath; | ||
|
|
||
| /** | ||
| * @author gmutuhu | ||
| * | ||
| */ | ||
| @AuthorizeInstantiation(SecurityConstants.Roles.ROLE_ADMIN) | ||
| @MountPath("/staff") | ||
| public class EditStaffPage extends AbstractCategoryEditPage<Staff> { | ||
| @SpringBean | ||
| private StaffService staffService; | ||
|
|
||
| @SpringBean | ||
| private DepartmentService departmentService; | ||
|
|
||
| public EditStaffPage(final PageParameters parameters) { | ||
| super(parameters); | ||
| jpaService = staffService; | ||
| listPageClass = ListStaffPage.class; | ||
| } | ||
|
|
||
| @Override | ||
| protected void onInitialize() { | ||
| super.onInitialize(); | ||
|
|
||
| final TextFieldBootstrapFormComponent<String> title = ComponentUtil.addTextField(editForm, "title"); | ||
| title.getField().add(WebConstants.StringValidators.MAXIMUM_LENGTH_VALIDATOR_STD_DEFAULT_TEXT); | ||
|
|
||
| ComponentUtil.addSelect2ChoiceField(editForm, "department", departmentService); | ||
| } | ||
| } |