slub.team team mailing list archive
-
slub.team team
-
Mailing list archive
-
Message #00389
[Merge] lp:~zeutschel/goobi-production/bug-1031240 into lp:goobi-production
Matthias Ronge has proposed merging lp:~zeutschel/goobi-production/bug-1031240 into lp:goobi-production.
Requested reviews:
Ralf Claussnitzer (ralf-claussnitzer)
Matthias Ronge (matthias-ronge)
Related bugs:
Bug #1031240 in Goobi.Production: "missing feature editing properties with alternate data type"
https://bugs.launchpad.net/goobi-production/+bug/1031240
For more details, see:
https://code.launchpad.net/~zeutschel/goobi-production/bug-1031240/+merge/123244
The code is removed now
--
https://code.launchpad.net/~zeutschel/goobi-production/bug-1031240/+merge/123244
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.
=== modified file 'newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp'
--- newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp 2011-12-22 13:29:56 +0000
+++ newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp 2012-09-07 10:13:23 +0000
@@ -3,6 +3,8 @@
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
+<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
+<%@ taglib uri="http://richfaces.org/rich"; prefix="rich"%>
<%--
~ This file is part of the Goobi Application - a Workflow tool for the support of
@@ -78,16 +80,6 @@
</h:column>
</x:dataTable>
- <%-- Neu-Schaltknopf --%>
- <h:commandLink action="#{AktuelleSchritteForm.SchrittEigenschaftNeu}" id="new"
- value="#{msgs.eigenschaftHinzufuegen}"
- title="#{msgs.eigenschaftHinzufuegen}"
- rendered="#{AktuelleSchritteForm.modusBearbeiten!='schritteeigenschaft' && 0==1}">
- <x:updateActionListener
- property="#{AktuelleSchritteForm.modusBearbeiten}"
- value="schritteeigenschaft" />
- </h:commandLink>
-
<%-- ++++++++++++++++++++++++++++++++++++++++++++++++++++ --%>
<%-- +++++++++++++++ Eigenschaft bearbeiten ++++++++++++++++ --%>
@@ -112,32 +104,184 @@
<htm:tr>
<htm:td styleClass="eingabeBoxen_row2" colspan="2">
- <x:dataTable cellspacing="1px" cellpadding="1px" id="subtable"
- columnClasses="standardTable_Column,standardTable_Column,standardTable_ColumnCentered"
- var="item" value="#{AktuelleSchritteForm.mySchritt.eigenschaftenList}">
-
- <h:column>
- <h:outputText value="#{item.titel}" />
- </h:column>
-
- <h:column>
- <h:inputText value="#{item.wert}" style="width:500px" id="myvalue"/>
- </h:column>
- </x:dataTable>
-
- <h:panelGrid columns="2" rendered="false">
- <%-- Felder --%>
- <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
- <h:outputText id="eigenschafttitel"
- value="#{AktuelleSchritteForm.mySchrittEigenschaft.titel}" />
-
- <h:outputLabel for="eigenschaftwert" value="#{msgs.wert}" />
- <h:panelGroup>
- <h:inputText id="eigenschaftwert"
- style="width: 300px;margin-right:15px"
- value="#{AktuelleSchritteForm.mySchrittEigenschaft.wert}" />
- </h:panelGroup>
- </h:panelGrid>
+ <x:dataTable id="container" var="container" value="#{AktuelleSchritteForm.mySchritt.displayProperties.containers}">
+ <h:column>
+ <x:dataTable id="eigenschaften" var="mystep_item" value="#{AktuelleSchritteForm.mySchritt.displayProperties.sortedProperties}" style="border-bottom: 1px solid #F4BBA5;">
+
+ <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
+ <h:outputText value="#{mystep_item.titel}" />
+
+ </h:column>
+
+ <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
+
+ <%-- textarea --%>
+ <h:panelGroup id="prpvw15_1"
+ rendered="#{((mystep_item.type.name == 'string') || (mystep_item.type.name == 'unknown') || (mystep_item.type.name == 'null') || (mystep_item.type.name == 'messagenormal'))}">
+
+ <h:inputText id="file" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}" />
+ <x:message id="prpvw15_1_1" for="file" style="color: red" replaceIdWithLabel="true" />
+ </h:panelGroup>
+
+ <%-- only text --%>
+ <h:panelGroup id="prpvw15_1e" rendered="#{((mystep_item.type.name == 'messageimportant') || (mystep_item.type.name == 'messageerror'))}">
+ <htm:div id="test" style="width: 500px;margin-right:15px">
+ <h:outputText id="filee" value="#{mystep_item.selectedValue}" />
+ </htm:div>
+ </h:panelGroup>
+
+ <%-- numbers only --%>
+ <h:panelGroup id="prpvw15_1m" rendered="#{mystep_item.type.name == 'integer' || mystep_item.type.name == 'number'}">
+ <h:outputLabel for="Number" value="#{mystep_item.titel}" style="display:none" />
+ <h:inputText id="Number" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}">
+ <f:validateLongRange minimum="0" />
+ </h:inputText>
+ <x:message id="prpvw15_1_12" for="Number" style="color: red" showSummary="true" />
+ </h:panelGroup>
+
+ <%-- SelectOneMenu --%>
+ <h:panelGroup id="prpvw15_2" rendered="#{(mystep_item.type.name == 'list')}">
+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_2_1" style="width: 500px;margin-right:15px">
+ <si:selectItems id="prpvw15_2_2" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+
+ <%-- SelectManyMenu --%>
+ <h:panelGroup id="prpvw15_3" rendered="#{(mystep_item.type.name == 'listmultiselect')}">
+ <h:selectManyListbox id="prpvw15_3_1" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValuesList}"
+ required="#{mystep_item.required}" size="5">
+ <si:selectItems id="prpvw15_3_2" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
+ </h:selectManyListbox>
+ </h:panelGroup>
+
+ <%-- Boolean --%>
+ <h:panelGroup id="prpvw15_4" rendered="#{(mystep_item.type.name == 'boolean')}">
+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_4_1" required="#{mystep_item.required}" style="width: 500px;margin-right:15px">
+ <f:selectItem id="prpvw15_4_2" itemValue="true" itemLabel="#{msgs.yes}" />
+ <f:selectItem id="prpvw15_4_3" itemValue="false" itemLabel="#{msgs.no}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+
+ <%-- Date --%>
+ <h:panelGroup id="prpvw15_5" rendered="#{(mystep_item.type.name == 'date')}">
+ <rich:calendar id="prpvw15_5_1" datePattern="dd.MM.yyyy" value="#{mystep_item.date}" enableManualInput="true">
+ </rich:calendar>
+ </h:panelGroup>
+ </h:column>
+ <%-- delete --%>
+ <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
+ <h:panelGroup>
+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.deleteProperty}"
+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
+ <h:graphicImage value="images/buttons/waste1a_20px.gif" />
+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
+ </h:commandLink>
+
+ </h:panelGroup>
+ <%-- duplicate --%>
+ <h:panelGroup>
+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.duplicateProperty}"
+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
+ <h:graphicImage value="/newpages/images/buttons/copy.gif" />
+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
+ </h:commandLink>
+ </h:panelGroup>
+ </h:column>
+
+
+<%-- container with properties --%>
+ <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
+ <h:outputText value="#{mystep_item.titel}" />
+
+ </h:column>
+
+ <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
+
+ <%-- textarea --%>
+ <h:panelGroup id="prpvw15_12"
+ rendered="#{((mystep_item.type.name == 'string') || (mystep_item.type.name == 'unknown') || (mystep_item.type.name == 'null') || (mystep_item.type.name == 'messagenormal'))}">
+
+ <h:inputText id="file2" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}" />
+ <x:message id="prpvw15_1_122246" for="file2" style="color: red" replaceIdWithLabel="true" />
+ </h:panelGroup>
+
+ <%-- only text --%>
+ <h:panelGroup id="prpvw15_12e" rendered="#{((mystep_item.type.name == 'messageimportant') || (mystep_item.type.name == 'messageerror'))}">
+ <htm:div id="test2" style="width: 500px;margin-right:15px">
+ <h:outputText id="filee2" value="#{mystep_item.selectedValue}" />
+ </htm:div>
+ </h:panelGroup>
+
+ <%-- numbers only --%>
+ <h:panelGroup id="prpvw15_12m" rendered="#{mystep_item.type.name == 'integer' || mystep_item.type.name == 'number'}">
+ <h:outputLabel for="Number2" value="#{mystep_item.titel}" style="display:none" />
+ <h:inputText id="Number2" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}">
+ <f:validateLongRange minimum="0" />
+ </h:inputText>
+ <x:message id="prpvw15_1_122" for="Number2" style="color: red" showSummary="true" />
+ </h:panelGroup>
+
+ <%-- SelectOneMenu --%>
+ <h:panelGroup id="prpvw15_22" rendered="#{(mystep_item.type.name == 'list')}">
+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_2_12" style="width: 500px;margin-right:15px">
+ <si:selectItems id="prpvw15_2_22" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+
+ <%-- SelectManyMenu --%>
+ <h:panelGroup id="prpvw15_32" rendered="#{(mystep_item.type.name == 'listmultiselect')}">
+ <h:selectManyListbox id="prpvw15_3_12" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValuesList}"
+ required="#{mystep_item.required}" size="5">
+ <si:selectItems id="prpvw15_3_22" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
+ </h:selectManyListbox>
+ </h:panelGroup>
+
+ <%-- Boolean --%>
+ <h:panelGroup id="prpvw15_42" rendered="#{(mystep_item.type.name == 'boolean')}">
+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_4_145" required="#{mystep_item.required}" style="width: 500px;margin-right:15px">
+ <f:selectItem id="prpvw15_4_22" itemValue="true" itemLabel="#{msgs.yes}" />
+ <f:selectItem id="prpvw15_4_32" itemValue="false" itemLabel="#{msgs.no}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+
+ <%-- Date --%>
+ <h:panelGroup id="prpvw15_52" rendered="#{(mystep_item.type.name == 'date')}">
+ <rich:calendar id="prpvw15_5_12" datePattern="dd.MM.yyyy" value="#{mystep_item.date}" enableManualInput="true">
+ </rich:calendar>
+ </h:panelGroup>
+
+
+ </h:column>
+ <%-- delete --%>
+ <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
+ <h:panelGroup>
+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.deleteProperty}"
+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
+ <h:graphicImage value="images/buttons/waste1a_20px.gif" />
+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
+ </h:commandLink>
+
+ </h:panelGroup>
+ <%-- duplicate --%>
+ <h:panelGroup>
+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.duplicateContainer}"
+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
+ <h:graphicImage value="/newpages/images/buttons/copy.gif" />
+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
+ </h:commandLink>
+
+ </h:panelGroup>
+
+ </h:column>
+ <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
+ <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
+
+ <htm:hr rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
+ <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
+ </x:dataTable>
+ </h:column>
+
+ </x:dataTable>
</htm:td>
</htm:tr>
=== modified file 'newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp'
--- newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp 2012-03-06 12:13:51 +0000
+++ newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp 2012-09-07 10:13:23 +0000
@@ -3,6 +3,8 @@
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
+<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
+<%@ taglib uri="http://richfaces.org/rich"; prefix="rich"%>
<%--
~ This file is part of the Goobi Application - a Workflow tool for the support of
@@ -107,27 +109,65 @@
<%-- Formular für die Bearbeitung der Eigenschaft --%>
<htm:tr>
<htm:td styleClass="eingabeBoxen_row2" colspan="2">
- <h:panelGrid columns="2">
-
- <%-- Felder --%>
- <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
- <h:panelGroup>
- <h:inputText id="eigenschafttitel"
- style="width: 300px;margin-right:15px"
- value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.titel}"
- required="true" />
- <x:message for="eigenschafttitel" style="color: red"
- detailFormat="#{msgs.keinTitelAngegeben}" />
- </h:panelGroup>
-
- <h:outputLabel for="eigenschaftwert" value="#{msgs.wert}" />
- <h:panelGroup>
- <h:inputText id="eigenschaftwert"
- style="width: 300px;margin-right:15px"
- value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.wert}" />
- </h:panelGroup>
- </h:panelGrid>
-
+ <x:aliasBean alias="#{myitem}" value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty}">
+ <h:panelGrid columns="2">
+
+
+ <%-- Felder --%>
+ <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
+ <h:panelGroup>
+ <h:inputText id="eigenschafttitel" style="width: 500px;margin-right:15px"
+ value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.titel}" required="true" />
+ <x:message for="eigenschafttitel" style="color: red" detailFormat="#{msgs.keinTitelAngegeben}" />
+ </h:panelGroup>
+
+
+
+ <h:outputText value="#{msgs.wert}" />
+ <%-- textarea --%>
+ <h:panelGroup id="prpvw15_1" rendered="#{((myitem.type.name == 'string') || (myitem.type.name == 'null'))}">
+ <h:inputText id="file" style="width: 500px;margin-right:15px" value="#{myitem.selectedValue}" required="#{myitem.required}" />
+ </h:panelGroup>
+
+ <%-- numbers only --%>
+ <h:panelGroup id="prpvw15_1mnk" rendered="#{myitem.type.name == 'integer' || myitem.type.name == 'number'}">
+
+ <h:inputText id="numberstuff122334mnktodo" style="width: 500px;margin-right:15px" value="#{myitem.selectedValue}" required="#{myitem.required}">
+ <f:validateLongRange minimum="0" />
+ </h:inputText>
+ </h:panelGroup>
+
+ <%-- SelectOneMenu --%>
+ <h:panelGroup id="prpvw15_2" rendered="#{(myitem.type.name == 'list')}">
+ <h:selectOneMenu value="#{myitem.selectedValue}" style="width: 500px;margin-right:15px" id="prpvw15_2_1">
+ <si:selectItems id="prpvw15_2_2" value="#{myitem.valuesList}" var="myitems" itemLabel="#{myitems}" itemValue="#{myitems}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+
+ <%-- SelectManyMenu --%>
+ <h:panelGroup id="prpvw15_3" rendered="#{(myitem.type.name == 'listmultiselect')}">
+ <h:selectManyListbox id="prpvw15_3_1" style="width: 500px;margin-right:15px" value="#{myitem.selectedValuesList}" required="#{myitem.required}"
+ size="10">
+ <si:selectItems id="prpvw15_3_2" value="#{myitem.valuesList}" var="myitems" itemLabel="#{myitems}" itemValue="#{myitems}" />
+ </h:selectManyListbox>
+ </h:panelGroup>
+
+ <%-- Boolean --%>
+ <h:panelGroup id="prpvw15_4" rendered="#{(myitem.type.name == 'boolean')}">
+ <h:selectOneMenu value="#{myitem.selectedValue}" style="width: 500px;margin-right:15px" id="prpvw15_4_1" required="#{myitem.required}">
+ <f:selectItem id="prpvw15_4_2" itemValue="true" itemLabel="#{msgs.yes}" />
+ <f:selectItem id="prpvw15_4_3" itemValue="false" itemLabel="#{msgs.no}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+
+ <%-- Date --%>
+ <h:panelGroup id="prpvw15_5" style="width: 500px;margin-right:15px" rendered="#{(myitem.type.name == 'date')}">
+ <rich:calendar id="prpvw15_5_1" datePattern="dd.MM.yyyy" value="#{myitem.date}" enableManualInput="true">
+ </rich:calendar>
+ </h:panelGroup>
+
+ </h:panelGrid>
+ </x:aliasBean>
</htm:td>
</htm:tr>
Follow ups
