Several bugfixes for the authoring steps of SciProject
parent
8c2ae8bd1d
commit
c34b6bdedb
|
|
@ -147,7 +147,8 @@ public class SciProject extends ContentItem implements Serializable {
|
|||
private List<Contact> contacts;
|
||||
|
||||
@OneToMany(mappedBy = "project", cascade = CascadeType.ALL)
|
||||
@OrderBy("member.personName ASC")
|
||||
// @OrderBy("member.personName ASC")
|
||||
@OrderBy("member ASC")
|
||||
private List<Membership> members;
|
||||
|
||||
@OneToMany(mappedBy = "project", cascade = CascadeType.ALL)
|
||||
|
|
|
|||
|
|
@ -227,6 +227,8 @@ public class SciProjectPropertiesStep extends AbstractMvcAuthoringStep {
|
|||
getDocument().setDisplayName(name);
|
||||
itemRepo.save(getDocument());
|
||||
|
||||
updateDocumentPath();
|
||||
|
||||
return buildRedirectPathForStep();
|
||||
} else {
|
||||
return documentUi.showAccessDenied(
|
||||
|
|
@ -506,7 +508,7 @@ public class SciProjectPropertiesStep extends AbstractMvcAuthoringStep {
|
|||
* @return A redirect to this authoring step.
|
||||
*/
|
||||
@POST
|
||||
@Path("/short-description/{locale}")
|
||||
@Path("/short-description/@edit/{locale}")
|
||||
@Transactional(Transactional.TxType.REQUIRED)
|
||||
@AuthorizationRequired
|
||||
public String editShortDescription(
|
||||
|
|
@ -552,7 +554,7 @@ public class SciProjectPropertiesStep extends AbstractMvcAuthoringStep {
|
|||
* @return A redirect to this authoring step.
|
||||
*/
|
||||
@POST
|
||||
@Path("/short-description/remove/{locale}")
|
||||
@Path("/short-description/@remove/{locale}")
|
||||
@Transactional(Transactional.TxType.REQUIRED)
|
||||
@AuthorizationRequired
|
||||
public String removeShortDescription(
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
<dl>
|
||||
<dt>#{SciProjectMessageBundle['basicproperties.end.label']}</dt>
|
||||
<dd>
|
||||
#{SciProjectPropertiesStep.end}
|
||||
#{SciProjectPropertiesStep.endDate}
|
||||
</dd>
|
||||
</dl>
|
||||
<div aria-hidden="true"
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
editDialogValueHelp="#{SciProjectMessageBundle['basicproperties.shortdescription.edit.value.help']}"
|
||||
editDialogValueLabel="#{SciProjectMessageBundle['basicproperties.shortdescription.edit.value.label']}"
|
||||
editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-basicproperties/short-description/@edit"
|
||||
editorId="title-editor"
|
||||
editorId="summary-editor"
|
||||
hasUnusedLocales="#{!SciProjectPropertiesStep.unusedShortDescriptionLocales.isEmpty()}"
|
||||
headingLevel="3"
|
||||
objectIdentifier="#{CmsSelectedDocumentModel.itemPath}"
|
||||
|
|
|
|||
|
|
@ -55,6 +55,13 @@
|
|||
name="type"
|
||||
/>
|
||||
</librecms:assetPicker>
|
||||
<c:choose>
|
||||
<c:when test="#{SciProjectDescriptionContacts.contacts.isEmpty()}">
|
||||
<p>#{SciProjectMessageBundle['contacts.none']}</p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -139,7 +146,8 @@
|
|||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
|
||||
<h3>#{SciProjectMessageBundle['memberships.header']}</h3>
|
||||
<div class="mb-2">
|
||||
|
|
@ -176,6 +184,11 @@
|
|||
/>
|
||||
|
||||
</librecms:assetPicker>
|
||||
<c:choose>
|
||||
<c:when test="#{SciProjectDescriptionMembers.members.isEmpty()}">
|
||||
<p>#{SciProjectMessageBundle['memberships.none']}</p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -272,6 +285,8 @@
|
|||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
|
||||
</ui:define>
|
||||
|
||||
|
|
|
|||
|
|
@ -163,3 +163,11 @@ createform.cancel=Cancel
|
|||
createform.submit=Create project
|
||||
createform.summary.help=A summary of the description of the research project.
|
||||
createform.summary.label=Summary
|
||||
authoringsteps.basicproperties.description=Basic properties of the research project description.
|
||||
authoringsteps.basicproperties.label=Basic properties
|
||||
authoringsteps.projectfunding.description=Information about the the funding of the research project.
|
||||
authoringsteps.projectfunding.label=Funding
|
||||
authoringsteps.projectdescription.description=Detailed description of the research project.
|
||||
authoringsteps.projectdescription.label=Description
|
||||
memberships.none=No memberships assigned yet.
|
||||
contacts.none=No contacts assigned yet.
|
||||
|
|
|
|||
|
|
@ -163,3 +163,11 @@ createform.cancel=Abbrechen
|
|||
createform.submit=Projekt anlegen
|
||||
createform.summary.help=Eine Zusammenfassung der Beschreibung des Forschungsprojektes.
|
||||
createform.summary.label=Zusammenfassung
|
||||
authoringsteps.basicproperties.description=Basiseigenschaften der Beschreibung des Forschungsprojektes.
|
||||
authoringsteps.basicproperties.label=Basiseigenschaften
|
||||
authoringsteps.projectfunding.description=Information about the the funding of the research project.
|
||||
authoringsteps.projectfunding.label=Finanzierung
|
||||
authoringsteps.projectdescription.description=Ausf\u00fchrliche Beschreibung des Forschungsprojektes.
|
||||
authoringsteps.projectdescription.label=Beschreibung
|
||||
memberships.none=Es wurden noch keine Mitglieder hinzugef\u00fcgt.
|
||||
contacts.none=Es wurden noch keine Kontakte hinzugef\u00fcgt.
|
||||
|
|
|
|||
Loading…
Reference in New Issue