summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-04-19 04:44:02 (EDT)
committer Stephan Born2013-04-19 04:44:02 (EDT)
commit932cb1796bab0cbe8ade210ce25f1cd32cce73cf (patch)
treeafff0d2f6a145de5a61b30346d0cec5664d09481
parentd0866497ebc66230af5e4f8c6cf1cbfea2dbf022 (diff)
downloadorg.eclipse.stardust.ui.web-932cb1796bab0cbe8ade210ce25f1cd32cce73cf.zip
org.eclipse.stardust.ui.web-932cb1796bab0cbe8ade210ce25f1cd32cce73cf.tar.gz
org.eclipse.stardust.ui.web-932cb1796bab0cbe8ade210ce25f1cd32cce73cf.tar.bz2
Jira-ID: CRNT-27164
Added fix to set cache=false for getStampsQueryURL() in m_pharmacyToolbarController.js git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@64310 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--graphics-common/src/main/resources/META-INF/xhtml/js/m_communicationController.js3
-rw-r--r--graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyToolbarController.js7
2 files changed, 8 insertions, 2 deletions
diff --git a/graphics-common/src/main/resources/META-INF/xhtml/js/m_communicationController.js b/graphics-common/src/main/resources/META-INF/xhtml/js/m_communicationController.js
index e356979..531a235 100644
--- a/graphics-common/src/main/resources/META-INF/xhtml/js/m_communicationController.js
+++ b/graphics-common/src/main/resources/META-INF/xhtml/js/m_communicationController.js
@@ -42,9 +42,10 @@ define(function(){
type: 'GET',
url: options.url,
async: false,
+ cache:options.hasOwnProperty('cacheData') ? options.cacheData : true,
success: callbacks.hasOwnProperty('success') ? callbacks.success : null,
error: callbacks.hasOwnProperty('error') ? callbacks.error : null
});
}
- }
+ };
}); \ No newline at end of file
diff --git a/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyToolbarController.js b/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyToolbarController.js
index c946c5a..a348496 100644
--- a/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyToolbarController.js
+++ b/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyToolbarController.js
@@ -235,6 +235,8 @@ define(["m_toolbarManager", "m_constants", "m_pageController"], function(m_toolb
function showStamps(args)
{
retrieveStamps();
+ // Clear the div before creating new
+ jQuery('#stampGallery').empty();
jQuery('#stampGallery').css("padding", "0px").html("<div style='max-height: 480px; overflow:scroll;'>" + generateStampsHTML(stamps) + "</div>");
jQuery('#stampGallery img').css("cursor", "pointer");
//Stamps selection handling
@@ -296,7 +298,10 @@ define(["m_toolbarManager", "m_constants", "m_pageController"], function(m_toolb
{
if (undefined == stamps)
{
- require("m_communicationController").syncGetData({url : require("m_urlUtils").getStampsQueryURL()}, new function() {
+ require("m_communicationController").syncGetData({
+ url : require("m_urlUtils").getStampsQueryURL(),
+ cacheData : false
+ }, new function() {
return {
success : function(data) {
stamps = data;