Author: saminda
Date: Thu Dec 13 06:39:01 2007
New Revision: 11091
Log:
Fix for JIRA-653
Modified:
trunk/wsas/java/modules/www/extensions/core/js/data_service.js
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl
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 Thu Dec
13 06:39:01 2007
@@ -263,7 +263,7 @@
currentDiv.style.display = "none";
currentDiv.innerHTML = "";
var divInnerHtml = yuiTransformer(dataServiceObj,
"data_service_add_query.xsl", false, [["queryId",queryId]]);
- showYUIPanel("Add/Edit New Query", divInnerHtml, "600px", "step2Inner13",
"divDSAddQuery");
+ showYUIPanel("Add/Edit Query", divInnerHtml, "600px", "step2Inner13",
"divDSAddQuery");
}
@@ -999,6 +999,19 @@
}
}
+//TODO : refresh parent query container
+/*
+* data_service_add_query.xsl
+* divDSAddQuery
+* Add New Query
+*
+*/
+function refreshParentQueryContainer(/*must*/queryId, /*must*/xslName,
/*must*/parentDivId, /*must*/title) {
+ var divInnerHtml = yuiTransformer(dataServiceObj, xslName, false,
[["queryId",queryId]]);
+ showYUIPanel(title, divInnerHtml, "600px", "step2Inner13", parentDivId);
+
+}
+
//TODO : note: adding and editing for output params
function addEditSpecificOutputMapping(queryId, mappingObj, oldOutputFieldName)
{
var qArray = dataServiceObj.getElementsByTagName('query');
@@ -1029,7 +1042,6 @@
}
var eEleArray = resultEle.getElementsByTagName('element');
var eEle1 = null;
- //TODO validation
if (name == oldOutputFieldName) {
//same elements and in the editing stage
for (i = 0; i < eEleArray.length; i++) {
@@ -1088,7 +1100,6 @@
}
} else if (mappingValue == 'Query') {
- //TODO validation
var obj = document.getElementById('cmbDataServiceQueryId');
var objValue = obj[obj.selectedIndex].value;
var cqArray = resultEle.getElementsByTagName("call-query");
@@ -1112,7 +1123,7 @@
currentDiv.style.display = "none";
currentDiv.innerHTML = "";
var divInnerHtml = yuiTransformer(dataServiceObj,
"data_service_add_query.xsl", false, [["queryId",queryId]]);
- showYUIPanel("Add New Query", divInnerHtml, "600px", "step2Inner13",
"divDSAddQuery");
+ showYUIPanel("Add/Edit Query", divInnerHtml, "600px", "step2Inner13",
"divDSAddQuery");
}
//TODO : note : add new output mapping.
@@ -1367,6 +1378,24 @@
}
}
+//TODO : note: removing the transient querty
+function removeTransientQuery(queryId) {
+ if (queryId) {
+ var qArray = dataServiceObj.getElementsByTagName('query');
+ var queryEle = null;
+ for (var i = 0; i < qArray.length; i++) {
+ if (queryId == qArray[i].getAttribute('id')) {
+ queryEle = qArray[i];
+ break;
+ }
+ }
+ if (queryEle) {
+ dataServiceObj.removeChild(queryEle);
+ }
+ }
+
+}
+
//TOdO : note: validate all operation names
function validateOperationNameValue(obj) {
var operations = dataServiceObj.getElementsByTagName("operation");
Modified:
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl
==============================================================================
---
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl
(original)
+++
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl
Thu Dec 13 06:39:01 2007
@@ -146,7 +146,7 @@
</div>
<div>
<input type="button"
onclick="addEditSpecificOutputMapping('{$queryId}',
document.getElementById('cmbDataServiceOMType'),'{$eleName}');return false;"
value="OK"/>
- <input type="button"
onclick="closeContainer('divADDEditOutputMapping');return false;"
value="Cancel"/>
+ <input type="button"
onclick="closeContainer('divADDEditOutputMapping');
refreshParentQueryContainer('{$queryId}', 'data_service_add_query.xsl',
'divDSAddQuery', 'Add New Query'); return false;" value="Cancel"/>
</div>
</fieldset>
</form>
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
Thu Dec 13 06:39:01 2007
@@ -192,18 +192,21 @@
<xsl:choose>
<xsl:when test="$queryId and ($dataSourceType='RDBMS' or
$dataSourceType='JNDIDataSource')">
<input type="button"
onClick="editSpecificQuery(document.getElementById('txtDataServiceQueryId').value,
document.getElementById('txtDataServiceSQL').value); return false;"
value="OK"/>
+ <!--<input type="button"
onClick="removeTransientElements(); closeContainer('divDSAddQuery'); return
false;" value="Cancel"/>-->
</xsl:when>
<xsl:when test="not($queryId) and ($dataSourceType='RDBMS'
or $dataSourceType='JNDIDataSource')">
<input type="button"
onClick="addNewQueryOK(document.getElementById('txtDataServiceQueryId').value);"
value="OK"/>
+ <input type="button"
onClick="removeTransientElements();
removeTransientQuery(document.getElementById('txtDataServiceQueryId').value);
closeContainer('divDSAddQuery'); return false;" value="Cancel"/>
</xsl:when>
<xsl:when test="$dataSourceType='EXCEL'">
<input type="button" value="OK"
onClick="addNewQueryOK(document.getElementById('txtDataServiceQueryId').value);return
false;"/>
+ <input type="button"
onClick="removeTransientElements();
removeTransientQuery(document.getElementById('txtDataServiceQueryId').value);
closeContainer('divDSAddQuery'); return false;" value="Cancel"/>
</xsl:when>
<xsl:when test="$dataSourceType='CSV'">
- <input type="button"
onClick="addNewQueryOK(document.getElementById('txtDataServiceQueryId').value);return
false;" value="OK"/>
+ <input type="button"
onClick="addNewQueryOK(document.getElementById('txtDataServiceQueryId').value);return
false;" value="OK"/>
+ <input type="button"
onClick="removeTransientElements();
removeTransientQuery(document.getElementById('txtDataServiceQueryId').value);closeContainer('divDSAddQuery');
return false;" value="Cancel"/>
</xsl:when>
</xsl:choose>
- <input type="button" onClick="removeTransientElements();
closeContainer('divDSAddQuery'); return false;" value="Cancel"/>
</div>
</div>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
