Skip to content

Commit 19f1629

Browse files
committed
Merge pull request 'Release v26.02' (#33) from release_26.02 into master
2 parents a81c37d + ce360ff commit 19f1629

File tree

6 files changed

+27
-9
lines changed

6 files changed

+27
-9
lines changed

module-base/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<parent>
55
<groupId>io.goobi.workflow.plugin</groupId>
66
<artifactId>plugin-workflow-entity-editor</artifactId>
7-
<version>26.01</version>
7+
<version>26.02</version>
88
</parent>
99
<artifactId>plugin-workflow-entity-editor-base</artifactId>
1010
<packaging>jar</packaging>
1111
<dependencies>
1212
<dependency>
1313
<groupId>io.goobi.workflow.plugin</groupId>
1414
<artifactId>plugin-workflow-entity-editor-lib</artifactId>
15-
<version>26.01</version>
15+
<version>26.02</version>
1616
</dependency>
1717
</dependencies>
1818
</project>

module-base/src/main/java/de/intranda/goobi/plugins/EntityEditorWorkflowPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.goobi.production.enums.PluginType;
3232
import org.goobi.production.plugin.PluginLoader;
3333
import org.goobi.production.plugin.interfaces.IExportPlugin;
34-
import org.goobi.production.plugin.interfaces.IPlugin;
3534
import org.goobi.production.plugin.interfaces.IWorkflowPlugin;
3635

3736
import de.intranda.goobi.plugins.model.BreadcrumbItem;
@@ -86,7 +85,7 @@
8685

8786
@PluginImplementation
8887
@Log4j2
89-
public class EntityEditorWorkflowPlugin implements IWorkflowPlugin, IPlugin {
88+
public class EntityEditorWorkflowPlugin implements IWorkflowPlugin {
9089

9190
private static final long serialVersionUID = 8882911907364782646L;
9291

module-gui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.goobi.workflow.plugin</groupId>
66
<artifactId>plugin-workflow-entity-editor</artifactId>
7-
<version>26.01</version>
7+
<version>26.02</version>
88
</parent>
99
<artifactId>plugin-workflow-entity-editor-gui</artifactId>
1010
<packaging>jar</packaging>

module-gui/src/main/webapp/resources/uii/plugin_workflow_entity_editor.xhtml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,26 @@
348348
itemValue="#{item.mainValue}" />
349349
</h:selectOneMenu>
350350
</ui:fragment>
351-
351+
<ui:fragment rendered="#{field.configField.fieldType == 'date'}">
352+
<h:inputText
353+
styleClass="form-control"
354+
value="#field.metadata.value}"
355+
required="false"
356+
readonly="false"
357+
id="dateField"
358+
validator="#{field.dateValidator}">
359+
<f:ajax
360+
event="change"
361+
render="badge-area :header"
362+
listener="#{NavigationForm.workflowPlugin.updateDisplayName}" />
363+
</h:inputText>
364+
<h:panelGroup
365+
layout="block"
366+
rendered="#{!field.valid}"
367+
styleClass="font-danger validation-message">
368+
<h:outputText value="#{field.validationErrorMessage}" />
369+
</h:panelGroup>
370+
</ui:fragment>
352371
</h:panelGroup>
353372

354373
<h:panelGroup

module-lib/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.goobi.workflow.plugin</groupId>
66
<artifactId>plugin-workflow-entity-editor</artifactId>
7-
<version>26.01</version>
7+
<version>26.02</version>
88
</parent>
99
<artifactId>plugin-workflow-entity-editor-lib</artifactId>
1010
<packaging>jar</packaging>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.goobi.workflow</groupId>
66
<artifactId>workflow-base</artifactId>
7-
<version>26.01</version>
7+
<version>26.02</version>
88
<relativePath/>
99
</parent>
1010
<groupId>io.goobi.workflow.plugin</groupId>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>io.goobi.workflow</groupId>
2828
<artifactId>workflow-core</artifactId>
29-
<version>26.01</version>
29+
<version>26.02</version>
3030
<classifier>classes</classifier>
3131
</dependency>
3232
</dependencies>

0 commit comments

Comments
 (0)