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
=== 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-06 07:41:27 +0000
@@ -3,6 +3,8 @@
3<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>3<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
4<%@ taglib uri="http://jsftutorials.net/htmLib" prefix="htm"%>4<%@ taglib uri="http://jsftutorials.net/htmLib" prefix="htm"%>
5<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>5<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
6<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi" prefix="si"%>
7<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
68
7<%--9<%--
8 ~ This file is part of the Goobi Application - a Workflow tool for the support of10 ~ This file is part of the Goobi Application - a Workflow tool for the support of
@@ -78,15 +80,15 @@
78 </h:column>80 </h:column>
79 </x:dataTable>81 </x:dataTable>
8082
81 <%-- Neu-Schaltknopf --%>83 <%-- Neu-Schaltknopf --%><%--
82 <h:commandLink action="#{AktuelleSchritteForm.SchrittEigenschaftNeu}" id="new"84 <h:commandLink action="#{AktuelleSchritteForm.SchrittEigenschaftNeu}" id="new"
83 value="#{msgs.eigenschaftHinzufuegen}"85 value="#{msgs.eigenschaftHinzufuegen}"
84 title="#{msgs.eigenschaftHinzufuegen}"86 title="#{msgs.eigenschaftHinzufuegen}"
85 rendered="#{AktuelleSchritteForm.modusBearbeiten!='schritteeigenschaft' && 0==1}">87 rendered="#{AktuelleSchritteForm.modusBearbeiten!='schritteeigenschaft'}">
86 <x:updateActionListener88 <x:updateActionListener
87 property="#{AktuelleSchritteForm.modusBearbeiten}"89 property="#{AktuelleSchritteForm.modusBearbeiten}"
88 value="schritteeigenschaft" />90 value="schritteeigenschaft" />
89 </h:commandLink>91 </h:commandLink> --%>
9092
9193
92 <%-- ++++++++++++++++++++++++++++++++++++++++++++++++++++ --%>94 <%-- ++++++++++++++++++++++++++++++++++++++++++++++++++++ --%>
@@ -112,32 +114,184 @@
112 <htm:tr>114 <htm:tr>
113 <htm:td styleClass="eingabeBoxen_row2" colspan="2">115 <htm:td styleClass="eingabeBoxen_row2" colspan="2">
114116
115 <x:dataTable cellspacing="1px" cellpadding="1px" id="subtable"117 <x:dataTable id="container" var="container" value="#{AktuelleSchritteForm.mySchritt.displayProperties.containers}">
116 columnClasses="standardTable_Column,standardTable_Column,standardTable_ColumnCentered"118 <h:column>
117 var="item" value="#{AktuelleSchritteForm.mySchritt.eigenschaftenList}">119 <x:dataTable id="eigenschaften" var="mystep_item" value="#{AktuelleSchritteForm.mySchritt.displayProperties.sortedProperties}" style="border-bottom: 1px solid #F4BBA5;">
118120
119 <h:column>121 <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
120 <h:outputText value="#{item.titel}" />122 <h:outputText value="#{mystep_item.titel}" />
121 </h:column>123
122124 </h:column>
123 <h:column>125
124 <h:inputText value="#{item.wert}" style="width:500px" id="myvalue"/>126 <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
125 </h:column>127
126 </x:dataTable>128 <%-- textarea --%>
127129 <h:panelGroup id="prpvw15_1"
128 <h:panelGrid columns="2" rendered="false">130 rendered="#{((mystep_item.type.name == 'string') || (mystep_item.type.name == 'unknown') || (mystep_item.type.name == 'null') || (mystep_item.type.name == 'messagenormal'))}">
129 <%-- Felder --%>131
130 <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />132 <h:inputText id="file" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}" />
131 <h:outputText id="eigenschafttitel"133 <x:message id="prpvw15_1_1" for="file" style="color: red" replaceIdWithLabel="true" />
132 value="#{AktuelleSchritteForm.mySchrittEigenschaft.titel}" />134 </h:panelGroup>
133135
134 <h:outputLabel for="eigenschaftwert" value="#{msgs.wert}" />136 <%-- only text --%>
135 <h:panelGroup>137 <h:panelGroup id="prpvw15_1e" rendered="#{((mystep_item.type.name == 'messageimportant') || (mystep_item.type.name == 'messageerror'))}">
136 <h:inputText id="eigenschaftwert"138 <htm:div id="test" style="width: 500px;margin-right:15px">
137 style="width: 300px;margin-right:15px"139 <h:outputText id="filee" value="#{mystep_item.selectedValue}" />
138 value="#{AktuelleSchritteForm.mySchrittEigenschaft.wert}" />140 </htm:div>
139 </h:panelGroup>141 </h:panelGroup>
140 </h:panelGrid>142
143 <%-- numbers only --%>
144 <h:panelGroup id="prpvw15_1m" rendered="#{mystep_item.type.name == 'integer' || mystep_item.type.name == 'number'}">
145 <h:outputLabel for="Number" value="#{mystep_item.titel}" style="display:none" />
146 <h:inputText id="Number" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}">
147 <f:validateLongRange minimum="0" />
148 </h:inputText>
149 <x:message id="prpvw15_1_12" for="Number" style="color: red" showSummary="true" />
150 </h:panelGroup>
151
152 <%-- SelectOneMenu --%>
153 <h:panelGroup id="prpvw15_2" rendered="#{(mystep_item.type.name == 'list')}">
154 <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_2_1" style="width: 500px;margin-right:15px">
155 <si:selectItems id="prpvw15_2_2" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
156 </h:selectOneMenu>
157 </h:panelGroup>
158
159 <%-- SelectManyMenu --%>
160 <h:panelGroup id="prpvw15_3" rendered="#{(mystep_item.type.name == 'listmultiselect')}">
161 <h:selectManyListbox id="prpvw15_3_1" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValuesList}"
162 required="#{mystep_item.required}" size="5">
163 <si:selectItems id="prpvw15_3_2" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
164 </h:selectManyListbox>
165 </h:panelGroup>
166
167 <%-- Boolean --%>
168 <h:panelGroup id="prpvw15_4" rendered="#{(mystep_item.type.name == 'boolean')}">
169 <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_4_1" required="#{mystep_item.required}" style="width: 500px;margin-right:15px">
170 <f:selectItem id="prpvw15_4_2" itemValue="true" itemLabel="#{msgs.yes}" />
171 <f:selectItem id="prpvw15_4_3" itemValue="false" itemLabel="#{msgs.no}" />
172 </h:selectOneMenu>
173 </h:panelGroup>
174
175 <%-- Date --%>
176 <h:panelGroup id="prpvw15_5" rendered="#{(mystep_item.type.name == 'date')}">
177 <rich:calendar id="prpvw15_5_1" datePattern="dd.MM.yyyy" value="#{mystep_item.date}" enableManualInput="true">
178 </rich:calendar>
179 </h:panelGroup>
180 </h:column>
181 <%-- delete --%>
182 <h:column rendered="#{mystep_item.container==0 && mystep_item.container==container}">
183 <h:panelGroup>
184 <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.deleteProperty}"
185 rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
186 <h:graphicImage value="images/buttons/waste1a_20px.gif" />
187 <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
188 </h:commandLink>
189
190 </h:panelGroup>
191 <%-- duplicate --%>
192 <h:panelGroup>
193 <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.duplicateProperty}"
194 rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
195 <h:graphicImage value="/newpages/images/buttons/copy.gif" />
196 <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
197 </h:commandLink>
198 </h:panelGroup>
199 </h:column>
200
201
202<%-- container with properties --%>
203 <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
204 <h:outputText value="#{mystep_item.titel}" />
205
206 </h:column>
207
208 <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
209
210 <%-- textarea --%>
211 <h:panelGroup id="prpvw15_12"
212 rendered="#{((mystep_item.type.name == 'string') || (mystep_item.type.name == 'unknown') || (mystep_item.type.name == 'null') || (mystep_item.type.name == 'messagenormal'))}">
213
214 <h:inputText id="file2" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}" />
215 <x:message id="prpvw15_1_122246" for="file2" style="color: red" replaceIdWithLabel="true" />
216 </h:panelGroup>
217
218 <%-- only text --%>
219 <h:panelGroup id="prpvw15_12e" rendered="#{((mystep_item.type.name == 'messageimportant') || (mystep_item.type.name == 'messageerror'))}">
220 <htm:div id="test2" style="width: 500px;margin-right:15px">
221 <h:outputText id="filee2" value="#{mystep_item.selectedValue}" />
222 </htm:div>
223 </h:panelGroup>
224
225 <%-- numbers only --%>
226 <h:panelGroup id="prpvw15_12m" rendered="#{mystep_item.type.name == 'integer' || mystep_item.type.name == 'number'}">
227 <h:outputLabel for="Number2" value="#{mystep_item.titel}" style="display:none" />
228 <h:inputText id="Number2" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValue}" required="#{mystep_item.required}">
229 <f:validateLongRange minimum="0" />
230 </h:inputText>
231 <x:message id="prpvw15_1_122" for="Number2" style="color: red" showSummary="true" />
232 </h:panelGroup>
233
234 <%-- SelectOneMenu --%>
235 <h:panelGroup id="prpvw15_22" rendered="#{(mystep_item.type.name == 'list')}">
236 <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_2_12" style="width: 500px;margin-right:15px">
237 <si:selectItems id="prpvw15_2_22" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
238 </h:selectOneMenu>
239 </h:panelGroup>
240
241 <%-- SelectManyMenu --%>
242 <h:panelGroup id="prpvw15_32" rendered="#{(mystep_item.type.name == 'listmultiselect')}">
243 <h:selectManyListbox id="prpvw15_3_12" style="width: 500px;margin-right:15px" value="#{mystep_item.selectedValuesList}"
244 required="#{mystep_item.required}" size="5">
245 <si:selectItems id="prpvw15_3_22" value="#{mystep_item.valuesList}" var="mystep_items" itemLabel="#{mystep_items}" itemValue="#{mystep_items}" />
246 </h:selectManyListbox>
247 </h:panelGroup>
248
249 <%-- Boolean --%>
250 <h:panelGroup id="prpvw15_42" rendered="#{(mystep_item.type.name == 'boolean')}">
251 <h:selectOneMenu value="#{mystep_item.selectedValue}" id="prpvw15_4_145" required="#{mystep_item.required}" style="width: 500px;margin-right:15px">
252 <f:selectItem id="prpvw15_4_22" itemValue="true" itemLabel="#{msgs.yes}" />
253 <f:selectItem id="prpvw15_4_32" itemValue="false" itemLabel="#{msgs.no}" />
254 </h:selectOneMenu>
255 </h:panelGroup>
256
257 <%-- Date --%>
258 <h:panelGroup id="prpvw15_52" rendered="#{(mystep_item.type.name == 'date')}">
259 <rich:calendar id="prpvw15_5_12" datePattern="dd.MM.yyyy" value="#{mystep_item.date}" enableManualInput="true">
260 </rich:calendar>
261 </h:panelGroup>
262
263
264 </h:column>
265 <%-- delete --%>
266 <h:column rendered="#{mystep_item.container!=0 && mystep_item.container==container}">
267 <h:panelGroup>
268 <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.deleteProperty}"
269 rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
270 <h:graphicImage value="images/buttons/waste1a_20px.gif" />
271 <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
272 </h:commandLink>
273
274 </h:panelGroup>
275 <%-- duplicate --%>
276 <h:panelGroup>
277 <h:commandLink action="#{AktuelleSchritteForm.mySchritt.displayProperties.duplicateContainer}"
278 rendered="#{mystep_item.type.name != 'messageerror' && mystep_item.type.name != 'messageimportant' && mystep_item.type.name != 'messagenormal'}">
279 <h:graphicImage value="/newpages/images/buttons/copy.gif" />
280 <x:updateActionListener value="#{mystep_item}" property="#{AktuelleSchritteForm.mySchritt.displayProperties.currentProperty}" />
281 </h:commandLink>
282
283 </h:panelGroup>
284
285 </h:column>
286 <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
287 <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
288
289 <htm:hr rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
290 <htm:br rendered="#{mystep_item.container!=0 && mystep_item.container==container}" />
291 </x:dataTable>
292 </h:column>
293
294 </x:dataTable>
141295
142 </htm:td>296 </htm:td>
143 </htm:tr>297 </htm:tr>
144298
=== 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-06 07:41:27 +0000
@@ -3,6 +3,8 @@
3<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>3<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
4<%@ taglib uri="http://jsftutorials.net/htmLib" prefix="htm"%>4<%@ taglib uri="http://jsftutorials.net/htmLib" prefix="htm"%>
5<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>5<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="x"%>
6<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi" prefix="si"%>
7<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
68
7<%--9<%--
8 ~ This file is part of the Goobi Application - a Workflow tool for the support of10 ~ This file is part of the Goobi Application - a Workflow tool for the support of
@@ -107,27 +109,65 @@
107 <%-- Formular für die Bearbeitung der Eigenschaft --%>109 <%-- Formular für die Bearbeitung der Eigenschaft --%>
108 <htm:tr>110 <htm:tr>
109 <htm:td styleClass="eingabeBoxen_row2" colspan="2">111 <htm:td styleClass="eingabeBoxen_row2" colspan="2">
110 <h:panelGrid columns="2">112 <x:aliasBean alias="#{myitem}" value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty}">
111113 <h:panelGrid columns="2">
112 <%-- Felder --%>114
113 <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />115
114 <h:panelGroup>116 <%-- Felder --%>
115 <h:inputText id="eigenschafttitel"117 <h:outputLabel for="eigenschafttitel" value="#{msgs.titel}" />
116 style="width: 300px;margin-right:15px"118 <h:panelGroup>
117 value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.titel}"119 <h:inputText id="eigenschafttitel" style="width: 500px;margin-right:15px"
118 required="true" />120 value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.titel}" required="true" />
119 <x:message for="eigenschafttitel" style="color: red"121 <x:message for="eigenschafttitel" style="color: red" detailFormat="#{msgs.keinTitelAngegeben}" />
120 detailFormat="#{msgs.keinTitelAngegeben}" />122 </h:panelGroup>
121 </h:panelGroup>123
122124
123 <h:outputLabel for="eigenschaftwert" value="#{msgs.wert}" />125
124 <h:panelGroup>126 <h:outputText value="#{msgs.wert}" />
125 <h:inputText id="eigenschaftwert"127 <%-- textarea --%>
126 style="width: 300px;margin-right:15px"128 <h:panelGroup id="prpvw15_1" rendered="#{((myitem.type.name == 'string') || (myitem.type.name == 'null'))}">
127 value="#{ProzessverwaltungForm.mySchritt.displayProperties.currentProperty.wert}" />129 <h:inputText id="file" style="width: 500px;margin-right:15px" value="#{myitem.selectedValue}" required="#{myitem.required}" />
128 </h:panelGroup>130 </h:panelGroup>
129 </h:panelGrid>131
130132 <%-- numbers only --%>
133 <h:panelGroup id="prpvw15_1mnk" rendered="#{myitem.type.name == 'integer' || myitem.type.name == 'number'}">
134
135 <h:inputText id="numberstuff122334mnktodo" style="width: 500px;margin-right:15px" value="#{myitem.selectedValue}" required="#{myitem.required}">
136 <f:validateLongRange minimum="0" />
137 </h:inputText>
138 </h:panelGroup>
139
140 <%-- SelectOneMenu --%>
141 <h:panelGroup id="prpvw15_2" rendered="#{(myitem.type.name == 'list')}">
142 <h:selectOneMenu value="#{myitem.selectedValue}" style="width: 500px;margin-right:15px" id="prpvw15_2_1">
143 <si:selectItems id="prpvw15_2_2" value="#{myitem.valuesList}" var="myitems" itemLabel="#{myitems}" itemValue="#{myitems}" />
144 </h:selectOneMenu>
145 </h:panelGroup>
146
147 <%-- SelectManyMenu --%>
148 <h:panelGroup id="prpvw15_3" rendered="#{(myitem.type.name == 'listmultiselect')}">
149 <h:selectManyListbox id="prpvw15_3_1" style="width: 500px;margin-right:15px" value="#{myitem.selectedValuesList}" required="#{myitem.required}"
150 size="10">
151 <si:selectItems id="prpvw15_3_2" value="#{myitem.valuesList}" var="myitems" itemLabel="#{myitems}" itemValue="#{myitems}" />
152 </h:selectManyListbox>
153 </h:panelGroup>
154
155 <%-- Boolean --%>
156 <h:panelGroup id="prpvw15_4" rendered="#{(myitem.type.name == 'boolean')}">
157 <h:selectOneMenu value="#{myitem.selectedValue}" style="width: 500px;margin-right:15px" id="prpvw15_4_1" required="#{myitem.required}">
158 <f:selectItem id="prpvw15_4_2" itemValue="true" itemLabel="#{msgs.yes}" />
159 <f:selectItem id="prpvw15_4_3" itemValue="false" itemLabel="#{msgs.no}" />
160 </h:selectOneMenu>
161 </h:panelGroup>
162
163 <%-- Date --%>
164 <h:panelGroup id="prpvw15_5" style="width: 500px;margin-right:15px" rendered="#{(myitem.type.name == 'date')}">
165 <rich:calendar id="prpvw15_5_1" datePattern="dd.MM.yyyy" value="#{myitem.date}" enableManualInput="true">
166 </rich:calendar>
167 </h:panelGroup>
168
169 </h:panelGrid>
170 </x:aliasBean>
131 </htm:td>171 </htm:td>
132 </htm:tr>172 </htm:tr>
133173

Subscribers

People subscribed via source and target branches