Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4257] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main
|
From: <die...@us...> - 2013-06-14 14:05:31
|
Revision: 4257
http://openutils.svn.sourceforge.net/openutils/?rev=4257&view=rev
Author: diego_schivo
Date: 2013-06-14 14:05:21 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 website.sample-controls.xml
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java 2013-06-14 14:00:34 UTC (rev 4256)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java 2013-06-14 14:05:21 UTC (rev 4257)
@@ -33,8 +33,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
-
import org.apache.commons.lang.StringUtils;
@@ -172,6 +170,12 @@
throws RepositoryException
{
super.init(request, response, websiteNode, configNode);
+ if (StringUtils.isEmpty(getConfigValue("saveHandler")))
+ {
+ setConfig(
+ "saveHandler",
+ "net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListSaveHandler");
+ }
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl 2013-06-14 14:00:34 UTC (rev 4256)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl 2013-06-14 14:05:21 UTC (rev 4257)
@@ -3,7 +3,7 @@
<select style="width:100%;" class="mgnlDialogControlSelect" id="${paramSelect}" name="${paramSelect}">
<option value="">- select -</option>
[#list options?keys as key]
- <option value="${key?html!}"[#if key = request.getParameter(paramSelect)!] selected="selected"[/#if]>${options[key]!}</option>
+ <option value="${key?html!}"[#if key = treePathValues[options_index]!] selected="selected"[/#if]>${options[key]!}</option>
[/#list]
</select>
[/#list]
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-06-14 14:00:34 UTC (rev 4256)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-06-14 14:05:21 UTC (rev 4257)
@@ -29,7 +29,7 @@
<sv:value>2010-05-11T18:45:03.281+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T15:14:54.258+02:00</sv:value>
+ <sv:value>2013-06-14T16:02:47.597+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:pages/sampleControls</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2010-05-11T18:55:40.453+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T14:55:50.194+02:00</sv:value>
+ <sv:value>2013-06-14T16:02:47.597+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -221,5 +221,54 @@
</sv:node>
</sv:node>
</sv:node>
+ <sv:node sv:name="00">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:component</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2f0eb337-36c7-4dc6-bdd8-4a904834d038</sv:value>
+ </sv:property>
+ <sv:property sv:name="foo" sv:type="String">
+ <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+ </sv:property>
+ <sv:property sv:name="fooSelect0" sv:type="String">
+ <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
+ </sv:property>
+ <sv:property sv:name="fooSelect1" sv:type="String">
+ <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
+ </sv:property>
+ <sv:property sv:name="fooSelect2" sv:type="String">
+ <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
+ </sv:property>
+ <sv:property sv:name="fooSelect3" sv:type="String">
+ <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-06-14T16:00:43.989+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-06-14T16:02:47.596+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>controls:components/samples-dependentSelectList</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
