Skip to content

Commit

Permalink
Merge pull request 'Release v24.10' (#18) from release_24.10 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominick Leppich committed Nov 22, 2024
2 parents 729c183 + 224a435 commit 9823028
Show file tree
Hide file tree
Showing 14 changed files with 463 additions and 436 deletions.
2 changes: 1 addition & 1 deletion module-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.goobi.workflow.plugin</groupId>
<artifactId>plugin-workflow-entity-editor</artifactId>
<version>24.09</version>
<version>24.10</version>
</parent>
<artifactId>plugin-workflow-entity-editor-base</artifactId>
<packaging>jar</packaging>
Expand Down
265 changes: 99 additions & 166 deletions module-base/src/main/java/de/intranda/goobi/plugins/EntityEditorWorkflowPlugin.java
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion module-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.goobi.workflow.plugin</groupId>
<artifactId>plugin-workflow-entity-editor</artifactId>
<version>24.09</version>
<version>24.10</version>
</parent>
<artifactId>plugin-workflow-entity-editor-gui</artifactId>
<packaging>jar</packaging>
Expand Down
43 changes: 35 additions & 8 deletions module-gui/src/main/webapp/resources/uii/includes/edit_relationship_modal.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
class="close"
data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true"> <h:outputText
<span aria-hidden="true">
<h:outputText
value="&amp;times;"
escape="false" />
</span>
Expand All @@ -56,11 +57,8 @@
prependId="false">
<div class="modal-body">

<h:panelGroup
rendered="#{NavigationForm.workflowPlugin.changeRelationshipEntity == null}">
<div class="alert alert-danger">
#{msgs.plugin_workflow_entity_locked}
</div>
<h:panelGroup rendered="#{NavigationForm.workflowPlugin.changeRelationshipEntity == null}">
<div class="alert alert-danger">#{msgs.plugin_workflow_entity_locked}</div>
</h:panelGroup>

<h:panelGroup
Expand Down Expand Up @@ -209,6 +207,35 @@
styleClass="form-control tinymce"
value="#{NavigationForm.workflowPlugin.relationshipData}" />
</div>


<ui:fragment rendered="#{NavigationForm.workflowPlugin.configuration.relationshipSourceType != ''}">
<div class="col-sm-3 noborder">
<h:outputLabel
value="#{msgs.plugin_workflow_entity_editor_sourceType}"
for="relationshipSourceType" />
</div>
<div class="col-sm-9">

<h:selectOneMenu
id="relationshipSourceType"
styleClass="form-control"
value="#{NavigationForm.workflowPlugin.relationshipSourceType}">
<f:selectItem
itemValue=""
itemLabel="#{msgs.bitteAuswaehlen}" />
<f:selectItem
itemLabel="#{msgs.plugin_workflow_entity_editor_primary}"
itemValue="Primary" />
<f:selectItem
itemLabel="#{msgs.plugin_workflow_entity_editor_secondary}"
itemValue="Secondary" />
<f:selectItem
itemLabel="#{msgs.plugin_workflow_entity_editor_tertiary}"
itemValue="Tertiary" />
</h:selectOneMenu>
</div>
</ui:fragment>
</h:panelGroup>
</h:panelGroup>
</h:panelGroup>
Expand All @@ -229,8 +256,8 @@
<button
class="btn pull-left"
title="#{msgs.cancel}"
jsf:action="#{NavigationForm.workflowPlugin.freeRelationshipLock()}"
> <h:outputText value="#{msgs.cancel}" />
jsf:action="#{NavigationForm.workflowPlugin.freeRelationshipLock()}">
<h:outputText value="#{msgs.cancel}" />
</button>

</div>
Expand Down
106 changes: 69 additions & 37 deletions module-gui/src/main/webapp/resources/uii/includes/link_entity_modal.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
</button>
<h4
class="modal-title"
style="width: 90%">#{msgs.plugin_workflow_entity_linkType} #{msgs[NavigationForm.workflowPlugin.entityType.name]}</h4>
style="width: 90%">#{msgs.plugin_workflow_entity_linkType}
#{msgs[NavigationForm.workflowPlugin.entityType.name]}</h4>
</div>
<div
jsf:id="entity-modal-body"
Expand Down Expand Up @@ -90,7 +91,8 @@
layout="block"
id="createEntity"
styleClass="row form-group vocabulary-searcharea">
<ui:fragment rendered="#{NavigationForm.workflowPlugin.selectedEntity == null and NavigationForm.workflowPlugin.entitySearch != '' and (NavigationForm.workflowPlugin.entities == null or NavigationForm.workflowPlugin.entities.size() == 0)}">
<ui:fragment
rendered="#{NavigationForm.workflowPlugin.selectedEntity == null and NavigationForm.workflowPlugin.entitySearch != '' and (NavigationForm.workflowPlugin.entities == null or NavigationForm.workflowPlugin.entities.size() == 0)}">
<div class="create-new-entity__hits">#{msgs.NORM_noHits}</div>
<div class="create-new-entity__actions">
<button
Expand All @@ -110,7 +112,8 @@
<h:panelGroup
id="entityList"
rendered="#{NavigationForm.workflowPlugin.selectedEntity == null}">
<ui:fragment rendered="#{NavigationForm.workflowPlugin.entities != null and NavigationForm.workflowPlugin.entities.size() != 0}">
<ui:fragment
rendered="#{NavigationForm.workflowPlugin.entities != null and NavigationForm.workflowPlugin.entities.size() != 0}">

<div class="modal__gnd-list link-entity-modal__search-results">
<x:dataList
Expand All @@ -137,7 +140,7 @@
value="#{msgs[configuredField.label]}" />
</h:panelGroup>

<h:panelGroup
<h:panelGroup
layout="block"
rendered="#{!field.configField.group and field.metadata.value != null}"
styleClass="col-sm-9">
Expand All @@ -154,7 +157,7 @@
<ui:repeat
var="subfield"
value="#{field.subfields}">
<h:panelGroup
<h:panelGroup
layout="block"
styleClass="#{subfield.configField.labelPosition == 'left' ? 'language-field' : ''}"
rendered="#{subfield.configField.showInSearch and subfield.configField.fieldType != 'language' and subfield.configField.fieldType != 'publish'}">
Expand Down Expand Up @@ -228,7 +231,9 @@
value="#{configuredField.metadataList}"
rendered="#{configuredField.showInSearch}">

<h:panelGroup styleClass="form-group noborder" rendered="#{field.showFieldInSearchResult}">
<h:panelGroup
styleClass="form-group noborder"
rendered="#{field.showFieldInSearchResult}">
<h:panelGroup
styleClass="col-sm-3 control-label"
rendered="#{field.configField.group or field.metadata.value != null}">
Expand Down Expand Up @@ -345,48 +350,75 @@
for="additionalData" />
</div>
<div class="col-sm-9">

<h:inputText
id="additionalData"
styleClass="form-control tinymce"
value="#{NavigationForm.workflowPlugin.relationshipData}" />
</div>
<ui:fragment rendered="#{NavigationForm.workflowPlugin.configuration.relationshipSourceType != ''}">
<div class="col-sm-3 noborder">
<h:outputLabel
value="#{msgs.plugin_workflow_entity_editor_sourceType}"
for="addRelationshipSourceType" />
</div>
<div class="col-sm-9">
<h:selectOneMenu
id="addRelationshipSourceType"
styleClass="form-control"
value="#{NavigationForm.workflowPlugin.relationshipSourceType}">
<f:selectItem
itemValue=""
itemLabel="#{msgs.bitteAuswaehlen}" />
<f:selectItem
itemLabel="#{msgs.plugin_workflow_entity_editor_primary}"
itemValue="Primary" />
<f:selectItem
itemLabel="#{msgs.plugin_workflow_entity_editor_secondary}"
itemValue="Secondary" />
<f:selectItem
itemLabel="#{msgs.plugin_workflow_entity_editor_tertiary}"
itemValue="Tertiary" />
</h:selectOneMenu>
</div>
</ui:fragment>

</h:panelGroup>
</h:panelGroup>
</h:panelGroup>

<!-- back to search list -->
<div class="link-entity-modal__actions">
<button
class="btn btn-lightgrey"
jsf:id="back"
jsf:rendered="#{NavigationForm.workflowPlugin.selectedEntity != null}">
<i
class="fa fa-undo margin-right-10"
aria-hidden="true"></i>
<h:outputText value="#{msgs.zurueck}" />
<f:passThroughAttribute
name="data-toggle"
value="tooltip" />
<f:setPropertyActionListener
value=""
target="#{NavigationForm.workflowPlugin.selectedEntity}" />
<f:ajax
execute="@this"
render="entityModalContent" />
</button>


<!-- add/save buttons -->

<button
jsf:action="#{NavigationForm.workflowPlugin.addRelationshipBetweenEntities}"
jsf:rendered="#{NavigationForm.workflowPlugin.selectedEntity != null}"
title="#{msgs.save}"
class="btn btn-green">
<i class="fa fa-floppy-o margin-right-10"></i>
<h:outputText value="#{msgs.save}" />
</button>
<button
class="btn btn-lightgrey"
jsf:id="back"
jsf:rendered="#{NavigationForm.workflowPlugin.selectedEntity != null}">
<i
class="fa fa-undo margin-right-10"
aria-hidden="true"></i>
<h:outputText value="#{msgs.zurueck}" />
<f:passThroughAttribute
name="data-toggle"
value="tooltip" />
<f:setPropertyActionListener
value=""
target="#{NavigationForm.workflowPlugin.selectedEntity}" />
<f:ajax
execute="@this"
render="entityModalContent" />
</button>


<!-- add/save buttons -->

<button
jsf:action="#{NavigationForm.workflowPlugin.addRelationshipBetweenEntities}"
jsf:rendered="#{NavigationForm.workflowPlugin.selectedEntity != null}"
title="#{msgs.save}"
class="btn btn-green">
<i class="fa fa-floppy-o margin-right-10"></i>
<h:outputText value="#{msgs.save}" />
</button>
</div>

</div>
Expand Down
24 changes: 16 additions & 8 deletions module-gui/src/main/webapp/resources/uii/includes/linked_entities.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,22 @@
<span> #{msgs[relationship.processStatus]} </span>
</div>
<div class="sources-row__item sources-row__item--actions">
<button
<button
class="btn nobackground"
jsf:id="changeRelationship"
style="color: #{type.key.color};"
style="color: #{type.key.color};"
jsf:action="#{NavigationForm.workflowPlugin.changeRelationship(relationship)}"
title="#{msgs.plugin_workflow_entity_editRelationship}"
data-toggle="tooltip"
data-placement="top">
<i class="fa fa-pencil-square-o" />
<f:ajax
execute="@this"
render=":relationshipModalContent"
onevent="openEditRelationshipModal" />
<f:ajax
execute="@this"
render=":relationshipModalContent"
onevent="openEditRelationshipModal" />
</button>


<button
type="button"
class="btn nobackground"
Expand Down Expand Up @@ -201,6 +201,14 @@
<div class="sources__key">#{msgs.plugin_workflow_entity_editor_additionalData}:</div>
<div class="sources__val">#{relationship.additionalData}</div>
</h:panelGroup>

<h:panelGroup
layout="block"
styleClass="sources__pair"
rendered="#{ not empty relationship.sourceType }">
<div class="sources__key">#{msgs.plugin_workflow_entity_editor_sourceType}:</div>
<div class="sources__val">#{relationship.sourceType}</div>
</h:panelGroup>
</div>
</ui:fragment>
</h:panelGroup>
Expand Down
Loading

0 comments on commit 9823028

Please sign in to comment.