Form for extended properties
Jens Pelzetter
parent
995d3ed63a
commit
6654577ac0
|
|
@ -15,6 +15,7 @@ import org.scientificcms.publications.assets.PublicationAsset;
|
|||
import org.scientificcms.publications.contenttypes.PublicationItem;
|
||||
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
|
@ -22,7 +23,6 @@ import java.util.stream.Collectors;
|
|||
import javax.inject.Inject;
|
||||
import javax.transaction.Transactional;
|
||||
import javax.ws.rs.FormParam;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.PathParam;
|
||||
|
|
@ -75,7 +75,7 @@ public abstract class AbstractPublicationExtentedPropertiesStep<T extends Public
|
|||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
protected abstract Class<P> getPublicationClass();
|
||||
|
||||
@Override
|
||||
|
|
@ -101,6 +101,16 @@ public abstract class AbstractPublicationExtentedPropertiesStep<T extends Public
|
|||
.map(lang -> lang.toString())
|
||||
.orElse(null)
|
||||
);
|
||||
propertiesStepModel.setLanguageOfPublicationDisplayName(
|
||||
Optional
|
||||
.ofNullable(publication.getLanguageOfPublication())
|
||||
.map(
|
||||
lang -> lang.getDisplayName(
|
||||
globalizationHelper.getNegotiatedLocale()
|
||||
)
|
||||
)
|
||||
.orElse(null)
|
||||
);
|
||||
propertiesStepModel.setPeerReviewed(
|
||||
Optional
|
||||
.ofNullable(publication.getPeerReviewed())
|
||||
|
|
@ -118,6 +128,20 @@ public abstract class AbstractPublicationExtentedPropertiesStep<T extends Public
|
|||
.ofNullable(publication.getYearFirstPublished())
|
||||
.orElse(null)
|
||||
);
|
||||
propertiesStepModel.setLanguages(
|
||||
Arrays
|
||||
.stream(Locale.getAvailableLocales())
|
||||
.sorted()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
Locale::toString,
|
||||
locale -> locale.getDisplayName(
|
||||
globalizationHelper.getNegotiatedLocale()
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
propertiesStepModel.setEditStepUrlFragment(getEditStepUrlFragment());
|
||||
}
|
||||
|
||||
@AuthorizationRequired
|
||||
|
|
@ -212,6 +236,8 @@ public abstract class AbstractPublicationExtentedPropertiesStep<T extends Public
|
|||
}
|
||||
}
|
||||
|
||||
protected abstract String getEditStepUrlFragment();
|
||||
|
||||
protected abstract String getStepTemplatePath();
|
||||
|
||||
private VolumeInSeriesRow buildVolumeInSeriesRow(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@ package org.scientificcms.publications.ui.contenttypes;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.enterprise.context.RequestScoped;
|
||||
import javax.inject.Named;
|
||||
|
|
@ -15,14 +17,20 @@ import javax.inject.Named;
|
|||
@Named("SciCmsPublicationExtendedPropertiesStepModel")
|
||||
public class PublicationExtendedPropertiesStepModel {
|
||||
|
||||
private String editStepUrlFragment;
|
||||
|
||||
private boolean peerReviewed;
|
||||
|
||||
private Integer yearFirstPublished;
|
||||
|
||||
private String languageOfPublication;
|
||||
|
||||
private String languageOfPublicationDisplayName;
|
||||
|
||||
private List<VolumeInSeriesRow> volumeInSeries;
|
||||
|
||||
private Map<String, String> languages;
|
||||
|
||||
public boolean isPeerReviewed() {
|
||||
return peerReviewed;
|
||||
}
|
||||
|
|
@ -55,4 +63,32 @@ public class PublicationExtendedPropertiesStepModel {
|
|||
this.volumeInSeries = new ArrayList<>(volumeInSeries);
|
||||
}
|
||||
|
||||
public Map<String, String> getLanguages() {
|
||||
return Collections.unmodifiableMap(languages);
|
||||
}
|
||||
|
||||
public void setLanguages(final Map<String, String> languages) {
|
||||
this.languages = new HashMap<>(languages);
|
||||
}
|
||||
|
||||
public String getLanguageOfPublicationDisplayName() {
|
||||
return languageOfPublicationDisplayName;
|
||||
}
|
||||
|
||||
public void setLanguageOfPublicationDisplayName(
|
||||
final String languageOfPublicationDisplayName
|
||||
) {
|
||||
this.languageOfPublicationDisplayName = languageOfPublicationDisplayName;
|
||||
}
|
||||
|
||||
public String getEditStepUrlFragment() {
|
||||
return editStepUrlFragment;
|
||||
}
|
||||
|
||||
public void setEditStepUrlFragment(final String editStepUrlFragment) {
|
||||
this.editStepUrlFragment = editStepUrlFragment;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,20 +8,101 @@
|
|||
<ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
|
||||
|
||||
<ui:define name="authoringStep">
|
||||
|
||||
|
||||
<h2>#{authoringStepTitle}</h2>
|
||||
|
||||
<!-- peerReviewed: boolean -->
|
||||
|
||||
<!-- yearFirstPublished -->
|
||||
|
||||
<!-- languageOfPublication: int -->
|
||||
|
||||
|
||||
<div class="text-right">
|
||||
<button class="btn btn-primary"
|
||||
data-toggle="modal"
|
||||
data-target="#extendedproperties-edit-dialog"
|
||||
type="button">
|
||||
<bootstrap:svgIcon icon="pen" />
|
||||
<span class="sr-only">#{SciPublicationsUiMessageBundle['publication.editstep.extendedproperties.edit']}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div aria-hidden="true"
|
||||
aria-labelledby="properties-edit-dialog-title"
|
||||
class="modal fade"
|
||||
id="extendedproperties-edit-dialog"
|
||||
tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@#{SciCmsPublicationExtendedPropertiesStepModel.editStepUrlFragment}/properties"
|
||||
class="modal-content"
|
||||
method="post">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title"
|
||||
id="properties-edit-dialog-title">
|
||||
#{SciPublicationsUiMessageBundle['publication.editstep.extendedproperties.edit.title']}
|
||||
</h4>
|
||||
<button
|
||||
aria-label="#{SciPublicationsUiMessageBundle['publication.editstep.extendedproperties.edit.close']}"
|
||||
class="close"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
<bootstrap:svgIcon icon="x" />
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<bootstrap:formCheck
|
||||
inputId="peer-reviewed"
|
||||
label="#{SciPublicationsUiMessageBundle['extendedproperties.peerreviewed.label']}"
|
||||
name="peerReviewed"
|
||||
value="#{SciCmsPublicationExtendedPropertiesStepModel.peerReviewed}"
|
||||
/>
|
||||
|
||||
<bootstrap:formGroupNumber
|
||||
help="#{SciPublicationsUiMessageBundle['extendedproperties.yearfirstpublished.help']}"
|
||||
inputId="year-first-published"
|
||||
label="#{SciPublicationsUiMessageBundle['extendedproperties.yearfirstpublished.label']}"
|
||||
name="yearFirstPublished"
|
||||
value="#{SciCmsPublicationExtendedPropertiesStepModel.yearFirstPublished}"
|
||||
/>
|
||||
|
||||
<bootstrap:formGroupSelect
|
||||
help="#{SciPublicationsUiMessageBundle['extendedproperties.languageofpublication.help']}"
|
||||
inputId="language-of-publication"
|
||||
label="#{SciPublicationsUiMessageBundle['extendedproperties.languageofpublication.label']}"
|
||||
name="languageOfPublication"
|
||||
options="#{SciCmsPublicationExtendedPropertiesStepModel.languages}"
|
||||
selectedOptions="#{List.of(SciCmsPublicationExtendedPropertiesStepModel.languageOfPublication)}"
|
||||
/>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-warning"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
#{SciPublicationsUiMessageBundle['publication.editstep.extededproperties.edit.close']}
|
||||
</button>
|
||||
<button class="btn btn-success"
|
||||
type="submit">
|
||||
#{SciPublicationsUiMessageBundle['publication.editstep.extendedproperties.edit.submit']}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<dl>
|
||||
<div>
|
||||
<dt>#{SciPublicationsUiMessageBundle['extendedproperties.peerreviewed.label']}</dt>
|
||||
<dd>#{SciCmsPublicationExtendedPropertiesStepModel.peerReviewed}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt>#{SciPublicationsUiMessageBundle['extendedproperties.yearfirstpublished.label']}</dt>
|
||||
<dd>#{SciCmsPublicationExtendedPropertiesStepModel.yearFirstPublished}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt>#{SciPublicationsUiMessageBundle['extendedproperties.languageofpublication.label']}</dt>
|
||||
<dd>#{SciCmsPublicationExtendedPropertiesStepModel.languageOfPublicationDisplayName}</dd>
|
||||
</div>
|
||||
|
||||
<ui:insert name="publicationExtendedProperties" />
|
||||
</dl>
|
||||
|
||||
<!-- series: asset -->
|
||||
|
||||
<ui:insert name="publicationExtendedProperties"/>
|
||||
|
||||
|
||||
<ui:insert name="publicationExtendedPropertyWidgets"/>
|
||||
|
||||
</ui:define>
|
||||
|
||||
|
||||
</ui:composition>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in New Issue