Goobi.Production

Merge lp:~zeutschel/goobi-production/bug-1031240 into lp:goobi-production/1.8

  1. bug-1031240
  2. Merge into 1.8
Proposed by Matthias Ronge
Status: Superseded
Proposed branch: lp:~zeutschel/goobi-production/bug-1031240
Merge into: lp:goobi-production/1.8
Diff against target: 341 lines (+244/-50)
2 files modified
newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp (+183/-29)
newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp (+61/-21)
To merge this branch: bzr merge lp:~zeutschel/goobi-production/bug-1031240
Reviewer Review Type Date Requested Status
Matthias Ronge (community) Needs Fixing
Ralf Claussnitzer (community) Needs Information
Review via email: mp+117389@code.launchpad.net

This proposal has been superseded by a proposal from 2012-09-06.

Description of the change

Bug fix for bug # 1031240

To post a comment you must log in.
Revision history for this message
Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount) wrote :

Doesn' work for me.

I merged the provided branch and the default propertyTemplates.xml from /config but the behavior did not change.
Is there something missing?

review: Needs Information
Revision history for this message
Matthias Ronge (matthias-ronge) wrote :

You’re right. It’s strange anyhow…

review: Needs Fixing
lp:~zeutschel/goobi-production/bug-1031240 updated
89. By Matthias Ronge

Added missing code to second version of schritt_box_Eigenschaften.jsp in inc_AktuelleSchritte folder, too

90. By Matthias Ronge

Not functioning code removed

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp'
2--- newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp 2011-12-22 13:29:56 +0000
3+++ newpages/inc_AktuelleSchritte/schritt_box_Eigenschaften.jsp 2012-09-06 07:41:27 +0000
4@@ -3,6 +3,8 @@
5 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
6 <%@ taglib uri="http://jsftutorials.net/htmLib" prefix="htm"%>
7 <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
8+<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi" prefix="si"%>
9+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
10
11 <%--
12 ~ This file is part of the Goobi Application - a Workflow tool for the support of
13@@ -78,15 +80,15 @@
14 </h:column>
15 </x:dataTable>
16
17- <%-- Neu-Schaltknopf --%>
18+ <%-- Neu-Schaltknopf --%><%--
19 <h:commandLink action="#{AktuelleSchritteForm.SchrittEigenschaftNeu}" id="new"
20 value="#{msgs.eigenschaftHinzufuegen}"
21 title="#{msgs.eigenschaftHinzufuegen}"
22- rendered="#{AktuelleSchritteForm.modusBearbeiten!='schritteeigenschaft' && 0==1}">
23+ rendered="#{AktuelleSchritteForm.modusBearbeiten!='schritteeigenschaft'}">
24 <x:updateActionListener
25 property="#{AktuelleSchritteForm.modusBearbeiten}"
26 value="schritteeigenschaft" />
27- </h:commandLink>
28+ </h:commandLink> --%>
29
30
31 <%-- ++++++++++++++++++++++++++++++++++++++++++++++++++++ --%>
32@@ -112,32 +114,184 @@
33 <htm:tr>
34 <htm:td styleClass="eingabeBoxen_row2" colspan="2">
35
36- <x:dataTable cellspacing="1px" cellpadding="1px" id="subtable"
37- columnClasses="standardTable_Column,standardTable_Column,standardTable_ColumnCentered"
38- var="item" value="#{AktuelleSchritteForm.mySchritt.eigenschaftenList}">
39-
40- <h:column>
41- <h:outputText value="#{item.titel}" />
42- </h:column>
43-
44- <h:column>
45- <h:inputText value="#{item.wert}" style="width:500px" id="myvalue"/>
46- </h:column>
47- </x:dataTable>
48-
49- <h:panelGrid columns="2" rendered="false">
50- <%-- Felder --%>
51- <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
52- <h:outputText id="eigenschafttitel"
53- value="#{AktuelleSchritteForm.mySchrittEigenschaft.titel}" />
54-
55- <h:outputLabel for="eigenschaftwert" value="#{msgs.wert}" />
56- <h:panelGroup>
57- <h:inputText id="eigenschaftwert"
58- style="width: 300px;margin-right:15px"
59- value="#{AktuelleSchritteForm.mySchrittEigenschaft.wert}" />
60- </h:panelGroup>
61- </h:panelGrid>
62+ <x:dataTable id="container" var="container" value="#{AktuelleSchritteForm.mySchritt.displayProperties.containers}">
63+ <h:column>
64+ <x:dataTable id="eigenschaften" var="mystep_item" value="#{AktuelleSchritteForm.mySchritt.displayProperties.sortedProperties}" style="border-bottom: 1px solid #F4BBA5;">
65+
66+ <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
67+ <h:outputText value="#{mystep_item.titel}" />
68+
69+ </h:column>
70+
71+ <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
72+
73+ <%-- textarea --%>
74+ <h:panelGroup id="prpvw15_1"
75+ rendered="#{((mystep_item.type.name == 'string') || (mystep_item.type.name == 'unknown') || (mystep_item.type.name == 'null') || (mystep_item.type.name == 'messagenormal'))}">
76+
77+ <h:inputText id="file" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}" />
78+ <x:message id="prpvw15_1_1" for="file" style="color: red" replaceIdWithLabel="true" />
79+ </h:panelGroup>
80+
81+ <%-- only text --%>
82+ <h:panelGroup id="prpvw15_1e" rendered="#{((mystep_item.type.name == 'messageimportant') || (mystep_item.type.name == 'messageerror'))}">
83+ <htm:div id="test" style="width: 500px;margin-right:15px">
84+ <h:outputText id="filee" value="#{mystep_item.selectedValue}" />
85+ </htm:div>
86+ </h:panelGroup>
87+
88+ <%-- numbers only --%>
89+ <h:panelGroup id="prpvw15_1m" rendered="#{mystep_item.type.name == 'integer' || mystep_item.type.name == 'number'}">
90+ <h:outputLabel for="Number" value="#{mystep_item.titel}" style="display:none" />
91+ <h:inputText id="Number" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}">
92+ <f:validateLongRange minimum="0" />
93+ </h:inputText>
94+ <x:message id="prpvw15_1_12" for="Number" style="color: red" showSummary="true" />
95+ </h:panelGroup>
96+
97+ <%-- SelectOneMenu --%>
98+ <h:panelGroup id="prpvw15_2" rendered="#{(mystep_item.type.name == 'list')}">
99+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_2_1" style="width: 500px;margin-right:15px">
100+ <si:selectItems id="prpvw15_2_2" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
101+ </h:selectOneMenu>
102+ </h:panelGroup>
103+
104+ <%-- SelectManyMenu --%>
105+ <h:panelGroup id="prpvw15_3" rendered="#{(mystep_item.type.name == 'listmultiselect')}">
106+ <h:selectManyListbox id="prpvw15_3_1" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValuesList}"
107+ required="#{mystep_item.required}" size="5">
108+ <si:selectItems id="prpvw15_3_2" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
109+ </h:selectManyListbox>
110+ </h:panelGroup>
111+
112+ <%-- Boolean --%>
113+ <h:panelGroup id="prpvw15_4" rendered="#{(mystep_item.type.name == 'boolean')}">
114+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_4_1" required="#{mystep_item.required}" style="width: 500px;margin-right:15px">
115+ <f:selectItem id="prpvw15_4_2" itemValue="true" itemLabel="#{msgs.yes}" />
116+ <f:selectItem id="prpvw15_4_3" itemValue="false" itemLabel="#{msgs.no}" />
117+ </h:selectOneMenu>
118+ </h:panelGroup>
119+
120+ <%-- Date --%>
121+ <h:panelGroup id="prpvw15_5" rendered="#{(mystep_item.type.name == 'date')}">
122+ <rich:calendar id="prpvw15_5_1" datePattern="dd.MM.yyyy" value="#{mystep_item.date}" enableManualInput="true">
123+ </rich:calendar>
124+ </h:panelGroup>
125+ </h:column>
126+ <%-- delete --%>
127+ <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
128+ <h:panelGroup>
129+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.deleteProperty}"
130+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
131+ <h:graphicImage value="images/buttons/waste1a_20px.gif" />
132+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
133+ </h:commandLink>
134+
135+ </h:panelGroup>
136+ <%-- duplicate --%>
137+ <h:panelGroup>
138+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.duplicateProperty}"
139+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
140+ <h:graphicImage value="/newpages/images/buttons/copy.gif" />
141+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
142+ </h:commandLink>
143+ </h:panelGroup>
144+ </h:column>
145+
146+
147+<%-- container with properties --%>
148+ <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
149+ <h:outputText value="#{mystep_item.titel}" />
150+
151+ </h:column>
152+
153+ <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
154+
155+ <%-- textarea --%>
156+ <h:panelGroup id="prpvw15_12"
157+ rendered="#{((mystep_item.type.name == 'string') || (mystep_item.type.name == 'unknown') || (mystep_item.type.name == 'null') || (mystep_item.type.name == 'messagenormal'))}">
158+
159+ <h:inputText id="file2" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}" />
160+ <x:message id="prpvw15_1_122246" for="file2" style="color: red" replaceIdWithLabel="true" />
161+ </h:panelGroup>
162+
163+ <%-- only text --%>
164+ <h:panelGroup id="prpvw15_12e" rendered="#{((mystep_item.type.name == 'messageimportant') || (mystep_item.type.name == 'messageerror'))}">
165+ <htm:div id="test2" style="width: 500px;margin-right:15px">
166+ <h:outputText id="filee2" value="#{mystep_item.selectedValue}" />
167+ </htm:div>
168+ </h:panelGroup>
169+
170+ <%-- numbers only --%>
171+ <h:panelGroup id="prpvw15_12m" rendered="#{mystep_item.type.name == 'integer' || mystep_item.type.name == 'number'}">
172+ <h:outputLabel for="Number2" value="#{mystep_item.titel}" style="display:none" />
173+ <h:inputText id="Number2" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}">
174+ <f:validateLongRange minimum="0" />
175+ </h:inputText>
176+ <x:message id="prpvw15_1_122" for="Number2" style="color: red" showSummary="true" />
177+ </h:panelGroup>
178+
179+ <%-- SelectOneMenu --%>
180+ <h:panelGroup id="prpvw15_22" rendered="#{(mystep_item.type.name == 'list')}">
181+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_2_12" style="width: 500px;margin-right:15px">
182+ <si:selectItems id="prpvw15_2_22" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
183+ </h:selectOneMenu>
184+ </h:panelGroup>
185+
186+ <%-- SelectManyMenu --%>
187+ <h:panelGroup id="prpvw15_32" rendered="#{(mystep_item.type.name == 'listmultiselect')}">
188+ <h:selectManyListbox id="prpvw15_3_12" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValuesList}"
189+ required="#{mystep_item.required}" size="5">
190+ <si:selectItems id="prpvw15_3_22" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
191+ </h:selectManyListbox>
192+ </h:panelGroup>
193+
194+ <%-- Boolean --%>
195+ <h:panelGroup id="prpvw15_42" rendered="#{(mystep_item.type.name == 'boolean')}">
196+ <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_4_145" required="#{mystep_item.required}" style="width: 500px;margin-right:15px">
197+ <f:selectItem id="prpvw15_4_22" itemValue="true" itemLabel="#{msgs.yes}" />
198+ <f:selectItem id="prpvw15_4_32" itemValue="false" itemLabel="#{msgs.no}" />
199+ </h:selectOneMenu>
200+ </h:panelGroup>
201+
202+ <%-- Date --%>
203+ <h:panelGroup id="prpvw15_52" rendered="#{(mystep_item.type.name == 'date')}">
204+ <rich:calendar id="prpvw15_5_12" datePattern="dd.MM.yyyy" value="#{mystep_item.date}" enableManualInput="true">
205+ </rich:calendar>
206+ </h:panelGroup>
207+
208+
209+ </h:column>
210+ <%-- delete --%>
211+ <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
212+ <h:panelGroup>
213+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.deleteProperty}"
214+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
215+ <h:graphicImage value="images/buttons/waste1a_20px.gif" />
216+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
217+ </h:commandLink>
218+
219+ </h:panelGroup>
220+ <%-- duplicate --%>
221+ <h:panelGroup>
222+ <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.duplicateContainer}"
223+ rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
224+ <h:graphicImage value="/newpages/images/buttons/copy.gif" />
225+ <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
226+ </h:commandLink>
227+
228+ </h:panelGroup>
229+
230+ </h:column>
231+ <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
232+ <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
233+
234+ <htm:hr rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
235+ <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
236+ </x:dataTable>
237+ </h:column>
238+
239+ </x:dataTable>
240
241 </htm:td>
242 </htm:tr>
243
244=== modified file 'newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp'
245--- newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp 2012-03-06 12:13:51 +0000
246+++ newpages/inc_Prozessverwaltung/schritt_box_Eigenschaften.jsp 2012-09-06 07:41:27 +0000
247@@ -3,6 +3,8 @@
248 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
249 <%@ taglib uri="http://jsftutorials.net/htmLib" prefix="htm"%>
250 <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
251+<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi" prefix="si"%>
252+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
253
254 <%--
255 ~ This file is part of the Goobi Application - a Workflow tool for the support of
256@@ -107,27 +109,65 @@
257 <%-- Formular für die Bearbeitung der Eigenschaft --%>
258 <htm:tr>
259 <htm:td styleClass="eingabeBoxen_row2" colspan="2">
260- <h:panelGrid columns="2">
261-
262- <%-- Felder --%>
263- <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
264- <h:panelGroup>
265- <h:inputText id="eigenschafttitel"
266- style="width: 300px;margin-right:15px"
267- value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.titel}"
268- required="true" />
269- <x:message for="eigenschafttitel" style="color: red"
270- detailFormat="#{msgs.keinTitelAngegeben}" />
271- </h:panelGroup>
272-
273- <h:outputLabel for="eigenschaftwert" value="#{msgs.wert}" />
274- <h:panelGroup>
275- <h:inputText id="eigenschaftwert"
276- style="width: 300px;margin-right:15px"
277- value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.wert}" />
278- </h:panelGroup>
279- </h:panelGrid>
280-
281+ <x:aliasBean alias="#{myitem}" value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty}">
282+ <h:panelGrid columns="2">
283+
284+
285+ <%-- Felder --%>
286+ <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
287+ <h:panelGroup>
288+ <h:inputText id="eigenschafttitel" style="width: 500px;margin-right:15px"
289+ value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.titel}" required="true" />
290+ <x:message for="eigenschafttitel" style="color: red" detailFormat="#{msgs.keinTitelAngegeben}" />
291+ </h:panelGroup>
292+
293+
294+
295+ <h:outputText value="#{msgs.wert}" />
296+ <%-- textarea --%>
297+ <h:panelGroup id="prpvw15_1" rendered="#{((myitem.type.name == 'string') || (myitem.type.name == 'null'))}">
298+ <h:inputText id="file" style="width: 500px;margin-right:15px" value="#{myitem.selectedValue}" required="#{myitem.required}" />
299+ </h:panelGroup>
300+
301+ <%-- numbers only --%>
302+ <h:panelGroup id="prpvw15_1mnk" rendered="#{myitem.type.name == 'integer' || myitem.type.name == 'number'}">
303+
304+ <h:inputText id="numberstuff122334mnktodo" style="width: 500px;margin-right:15px" value="#{myitem.selectedValue}" required="#{myitem.required}">
305+ <f:validateLongRange minimum="0" />
306+ </h:inputText>
307+ </h:panelGroup>
308+
309+ <%-- SelectOneMenu --%>
310+ <h:panelGroup id="prpvw15_2" rendered="#{(myitem.type.name == 'list')}">
311+ <h:selectOneMenu value="#{myitem.selectedValue}" style="width: 500px;margin-right:15px" id="prpvw15_2_1">
312+ <si:selectItems id="prpvw15_2_2" value="#{myitem.valuesList}" var="myitems" itemLabel="#{myitems}" itemValue="#{myitems}" />
313+ </h:selectOneMenu>
314+ </h:panelGroup>
315+
316+ <%-- SelectManyMenu --%>
317+ <h:panelGroup id="prpvw15_3" rendered="#{(myitem.type.name == 'listmultiselect')}">
318+ <h:selectManyListbox id="prpvw15_3_1" style="width: 500px;margin-right:15px" value="#{myitem.selectedValuesList}" required="#{myitem.required}"
319+ size="10">
320+ <si:selectItems id="prpvw15_3_2" value="#{myitem.valuesList}" var="myitems" itemLabel="#{myitems}" itemValue="#{myitems}" />
321+ </h:selectManyListbox>
322+ </h:panelGroup>
323+
324+ <%-- Boolean --%>
325+ <h:panelGroup id="prpvw15_4" rendered="#{(myitem.type.name == 'boolean')}">
326+ <h:selectOneMenu value="#{myitem.selectedValue}" style="width: 500px;margin-right:15px" id="prpvw15_4_1" required="#{myitem.required}">
327+ <f:selectItem id="prpvw15_4_2" itemValue="true" itemLabel="#{msgs.yes}" />
328+ <f:selectItem id="prpvw15_4_3" itemValue="false" itemLabel="#{msgs.no}" />
329+ </h:selectOneMenu>
330+ </h:panelGroup>
331+
332+ <%-- Date --%>
333+ <h:panelGroup id="prpvw15_5" style="width: 500px;margin-right:15px" rendered="#{(myitem.type.name == 'date')}">
334+ <rich:calendar id="prpvw15_5_1" datePattern="dd.MM.yyyy" value="#{myitem.date}" enableManualInput="true">
335+ </rich:calendar>
336+ </h:panelGroup>
337+
338+ </h:panelGrid>
339+ </x:aliasBean>
340 </htm:td>
341 </htm:tr>
342

Subscribers

People subscribed via source and target branches