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