svn commit: r593860 - in /ofbiz/trunk/framework/webtools/webapp/webtools: WEB-INF/actions/service/scheduleJob.bsh service/setServiceParameter.ftl

[jonesde]

Author: jonesde
Date: Sun Nov 11 00:37:39 2007
New Revision: 593860

URL: http://svn.apache.org/viewvc?rev=593860&view=rev
Log:
Small improvement to show default values, where applicable

Modified:
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh
    ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh?rev=593860&r1=593859&r2=593860&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh Sun Nov 11 00:37:39 2007
@@ -65,15 +65,15 @@
     if (model != null) {
         Iterator params = model.getInParamNames().iterator();
         while (params.hasNext()) {
-            ModelParam par = model.getParam((String)params.next());
+            ModelParam par = model.getParam((String) params.next());
             if (par.internal) {
                 continue;
             }
             Map serviceParam = null;
-            if(null!=savedSyncResult && null!=savedSyncResult.get(par.name)){
-                serviceParam = UtilMisc.toMap("name", par.name, "type", par.type, "optional", (par.optional? "Y": "N"), "value", savedSyncResult.get(par.name).toString());
+            if(null != savedSyncResult && null != savedSyncResult.get(par.name)){
+                serviceParam = UtilMisc.toMap("name", par.name, "type", par.type, "optional", (par.optional? "Y": "N"), "defaultValue", par.defaultValue, "value", savedSyncResult.get(par.name).toString());
             }else{
-                serviceParam = UtilMisc.toMap("name", par.name, "type", par.type, "optional", (par.optional? "Y": "N"));
+                serviceParam = UtilMisc.toMap("name", par.name, "type", par.type, "optional", (par.optional? "Y": "N"), "defaultValue", par.defaultValue);
             }
             serviceParameters.add(serviceParam);
         }

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl?rev=593860&r1=593859&r2=593860&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl Sun Nov 11 00:37:39 2007
@@ -28,8 +28,9 @@
       <tr>
         <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
         <td>
-          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" />
+          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}"/>
           <#if serviceParameter.optional == "N">(required)<#else>(optional)</#if>
+          <#if serviceParameter.defaultValue?has_content> (default: [${serviceParameter.defaultValue}])</#if>
         </td>
       </tr>
     </#list>