summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-11-19 04:26:04 (EST)
committer Sven Rottstock2012-11-19 04:26:04 (EST)
commit5f43f369cf0f5d7e863dc2ff50bfb46c59e0f823 (patch)
treefc7d102d818f6349eb1a6968746319368a6f44b2
parent4e0db329844bc1f15eb3e8682eee9639dfa6e14c (diff)
downloadorg.eclipse.stardust.ui.web-5f43f369cf0f5d7e863dc2ff50bfb46c59e0f823.zip
org.eclipse.stardust.ui.web-5f43f369cf0f5d7e863dc2ff50bfb46c59e0f823.tar.gz
org.eclipse.stardust.ui.web-5f43f369cf0f5d7e863dc2ff50bfb46c59e0f823.tar.bz2
CRNT-27060
a)Made changes in createDataFromDataStructure() in m_data.js b)generateIDFromName() in m_utils.js ,will generate UpperCase Id's for ModelElements. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60917 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js2
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_utils.js4
2 files changed, 4 insertions, 2 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js
index af15689..3061a34 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_data.js
@@ -37,7 +37,7 @@ define([ "m_utils", "m_constants", "m_modelElement", "m_command", "m_commandsCon
m_constants.STRUCTURED_DATA_TYPE);
data.dataType = m_constants.STRUCTURED_DATA_TYPE;
- data.structuredDataTypeFullId = dataStructure.getFullId();
+ data.structuredDataTypeFullId = data.getFullId();
return data;
},
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_utils.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_utils.js
index a5fe6ff..caf918b 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_utils.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_utils.js
@@ -47,7 +47,9 @@ define(
},
generateIDFromName : function(name) {
- return name.replace(/ /g, '_');
+ // Added toUpperCase for compatibility with server side Id
+ // generation logic
+ return name.replace(/ /g, '_').toUpperCase();
},
prettyDateTime : prettyDateTime,