DMC/scipro
7
0
Fork 0
Code Issues 25 Pull Requests 3 Actions Projects 1 Wiki Activity

Fix crash when editing an application period #117

Merged
niat8586 merged 4 commits from edit-application-period into develop 2025-03-03 07:48:47 +01:00
Conversation 2 Commits 4 Files Changed 4 +3 -20
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b12d3670a5 - Show all commits

8
view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java
View File

@ -123,13 +123,7 @@ public class AdminApplicationPeriodsPanel extends Panel {
item.add( item.add(
new DisplayMultiplesPanel<>( new DisplayMultiplesPanel<>(
s, s,
new ListAdapterModel<>( new ListAdapterModel<>(iModel.map(ApplicationPeriod::getProjectTypes))
LambdaModel.of(
iModel,
ApplicationPeriod::getProjectTypes,
ApplicationPeriod::setProjectTypes
)
)
) { ) {
@Override @Override
public Component getComponent(String componentId, IModel<ProjectType> t) { public Component getComponent(String componentId, IModel<ProjectType> t) {

7
view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java
View File

@ -22,12 +22,7 @@ public class AddTargetLinkPanel extends Panel {
public AddTargetLinkPanel(String id, final IModel<ApplicationPeriod> model) { public AddTargetLinkPanel(String id, final IModel<ApplicationPeriod> model) {
super(id, model); super(id, model);
add( add(
new ListView<>( new ListView<>("list", new ListAdapterModel<>(model.map(ApplicationPeriod::getProjectTypes))) {
"list",
new ListAdapterModel<>(
LambdaModel.of(model, ApplicationPeriod::getProjectTypes, ApplicationPeriod::setProjectTypes)
)
) {
@Override @Override
protected void populateItem(ListItem<ProjectType> item) { protected void populateItem(ListItem<ProjectType> item) {
item.add(new Label("pc", item.getModelObject().getName())); item.add(new Label("pc", item.getModelObject().getName()));

8
view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java
View File

@ -76,13 +76,7 @@ public class ProjectPartnerPage extends AbstractIdeaProjectPage implements MenuH
} }
); );
final IModel<? extends List<ProjectType>> matchableTypes = getMatchableTypes( final IModel<? extends List<ProjectType>> matchableTypes = getMatchableTypes(
new ListAdapterModel<>( new ListAdapterModel<>(applicationPeriod.map(ApplicationPeriod::getProjectTypes))
LambdaModel.of(
applicationPeriod,
ApplicationPeriod::getProjectTypes,
ApplicationPeriod::setProjectTypes
)
)
); );
panelContainer.add( panelContainer.add(
new ListView<>("ads", matchableTypes) { new ListView<>("ads", matchableTypes) {