From 8497e83c161efce8a9ba2394fcb0777b1b905667 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Tue, 30 Jan 2018 18:18:22 +0100
Subject: [PATCH] redmine 5515
---
js/app/views/ParameterUI.js | 18 +++++++++---------
js/app/views/SearchUI.js | 31 ++++++++++++++++---------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/js/app/views/ParameterUI.js b/js/app/views/ParameterUI.js
index 6f9931e..2c6e03e 100755
--- a/js/app/views/ParameterUI.js
+++ b/js/app/views/ParameterUI.js
@@ -299,19 +299,19 @@ Ext.define('amdaUI.ParameterUI',
notifyEnter : function(ddSource, e, data) {},
notifyOver : function(ddSource, e, data)
{
- if (data.records[0].data.nodeType == 'localParam' && data.records[0].get('notyet'))
+ if (data.records[0].get('nodeType') == 'localParam' && data.records[0].get('notyet'))
{
this.valid = false;
return this.dropNotAllowed;
}
- if (((data.records[0].data.nodeType == 'localParam') ||
- (data.records[0].data.nodeType == 'remoteParam') ||
- (data.records[0].data.nodeType == 'remoteSimuParam') ||
- (data.records[0].data.nodeType == 'derivedParam') ||
- (data.records[0].data.nodeType == 'myDataParam') ||
- (data.records[0].data.nodeType == 'alias')) &&
- //(data.records[0].data.leaf) &&
+ if (((data.records[0].get('nodeType') == 'localParam') ||
+ (data.records[0].get('nodeType') == 'remoteParam') ||
+ (data.records[0].get('nodeType') == 'remoteSimuParam') ||
+ (data.records[0].get('nodeType') == 'derivedParam') ||
+ (data.records[0].get('nodeType')== 'myDataParam') ||
+ (data.records[0].get('nodeType') == 'alias')) &&
+ (data.records[0].isLeaf() || data.records[0].get('isParameter')) &&
!(data.records[0].data.disable))
{
this.valid = true;
@@ -326,7 +326,7 @@ Ext.define('amdaUI.ParameterUI',
return false;
var nameToSent;
var components = null;
- switch (data.records[0].data.nodeType)
+ switch (data.records[0].get('nodeType'))
{
case 'localParam' :
case 'remoteParam' :
diff --git a/js/app/views/SearchUI.js b/js/app/views/SearchUI.js
index 0992e44..16599cd 100755
--- a/js/app/views/SearchUI.js
+++ b/js/app/views/SearchUI.js
@@ -346,24 +346,25 @@ Ext.define('amdaUI.SearchUI',
notifyEnter : function(ddSource, e, data){ },
notifyOver : function(ddSource, e, data)
{
- if (data.records[0].data.nodeType == 'localParam' && data.records[0].get('notyet')) {
+ if (data.records[0].get('nodeType') == 'localParam' && data.records[0].get('notyet')) {
this.valid = false;
return this.dropNotAllowed;
}
- if (((data.records[0].data.nodeType == 'localParam') ||
- (data.records[0].data.nodeType == 'remoteParam') ||
- (data.records[0].data.nodeType == 'remoteSimuParam') ||
- (data.records[0].data.nodeType == 'derivedParam') ||
- (data.records[0].data.nodeType == 'myDataParam') ||
- (data.records[0].data.nodeType == 'alias'))&&
- //(data.records[0].data.leaf) &&
- !data.records[0].data.disable)
- {
- this.valid = true;
- return this.dropAllowed;
- }
- this.valid = false;
- return this.dropNotAllowed;
+ if (((data.records[0].get('nodeType') == 'localParam') ||
+ (data.records[0].get('nodeType') == 'remoteParam') ||
+ (data.records[0].get('nodeType') == 'remoteSimuParam') ||
+ (data.records[0].get('nodeType') == 'derivedParam') ||
+ (data.records[0].get('nodeType') == 'myDataParam') ||
+ (data.records[0].get('nodeType') == 'alias')) &&
+ (data.records[0].isLeaf() || data.records[0].get('isParameter')) &&
+ !data.records[0].data.disable)
+ {
+ this.valid = true;
+ return this.dropAllowed;
+ }
+
+ this.valid = false;
+ return this.dropNotAllowed;
},
notifyDrop : function(ddSource, e, data)
{
--
libgit2 0.21.2