[wsas-java-dev] svn commit r11852 - in trunk/wsas/java/modules/www/extensions/core: js xslt

[svn at wso2.org]

Author: sumedha
Date: Fri Jan  4 09:04:58 2008
New Revision: 11852

Log:

group by & row elements are not mandatory for insert & update operations

Modified:
   trunk/wsas/java/modules/www/extensions/core/js/data_service.js
   trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl

Modified: trunk/wsas/java/modules/www/extensions/core/js/data_service.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/data_service.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/data_service.js	Fri Jan  4 09:04:58 2008
@@ -1271,13 +1271,20 @@
     }
     var elementName = document.getElementById("txtDataServiceWrapElement").value;
     var rowName = document.getElementById("txtDataServiceRowName").value;
-    if (elementName == null || elementName.length == 0) {
+    //eg. INSERT,UPDATE,SELECT,etc
+    //Only interested in INSERT & UPDATE
+    var firstPart = sql.substring(0,6); 
+    if(firstPart.toLowerCase() == "insert" || firstPart.toLowerCase() == "update"){
+     //grouped by element & row name are not needed here
+    }else{
+      if (elementName == null || elementName.length == 0) {
         wso2.wsf.Util.alertMessage("Grouped by element is required");
         return;
-    }
-    if (rowName == null || rowName.length == 0) {
+      }
+      if (rowName == null || rowName.length == 0) {
         wso2.wsf.Util.alertMessage("Row name is required");
         return;
+      }    
     }
     resultEle.setAttribute("element", elementName);
     resultEle.setAttribute("rowName", rowName);

Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl	(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl	Fri Jan  4 09:04:58 2008
@@ -112,7 +112,7 @@
                             <legend>Result (Output Mapping)</legend>
                             <div>
                                 <div>
-                                    <label style="width:150px;">Grouped by element<font color='red'>*</font></label>
+                                    <label style="width:150px;">Grouped by element</label>
                                     <input type="text">
                                         <xsl:attribute name="size">30</xsl:attribute>
                                         <xsl:attribute name="id">txtDataServiceWrapElement</xsl:attribute>
@@ -128,7 +128,7 @@
                                     </input>
                                 </div>
                                 <div>
-                                    <label style="width:150px;">Row name<font color='red'>*</font></label>
+                                    <label style="width:150px;">Row name</label>
                                     <input type="text">
                                         <xsl:attribute name="size">30</xsl:attribute>
                                         <xsl:attribute name="id">txtDataServiceRowName</xsl:attribute>