You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/04/20 17:13:46 UTC
svn commit: r1740154 -
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js
Author: orudyy
Date: Wed Apr 20 15:13:45 2016
New Revision: 1740154
URL: http://svn.apache.org/viewvc?rev=1740154&view=rev
Log:
QPID-6983: Fix criteria conjunction in WhereCriteria widget
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js?rev=1740154&r1=1740153&r2=1740154&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js Wed Apr 20 15:13:45 2016
@@ -109,7 +109,7 @@ function(declare, array, lang, string, t
typeValidValues: this.attributeDetails.validValues,
userPreferences: this.userPreferences});
this.criteriaContainer.addChild(criteriaPane);
- criteriaPane.on("change", lang.hitch(this, this._criteriaConditionChanged));
+ criteriaPane.on("change", lang.hitch(this, this._criteriaChanged));
this._updateRemovable();
return criteriaPane;
},
@@ -155,7 +155,7 @@ function(declare, array, lang, string, t
var expression = this._getUserFriendlyExpression();
this.criteria.set("label", expression);
},
- _criteriaConditionChanged: function(criteria)
+ _criteriaConditionChanged: function()
{
var isValid = this._validateCriteria();
if (isValid)
@@ -165,6 +165,10 @@ function(declare, array, lang, string, t
this._updateRemovable();
}
this.doneButton.set("disabled", !isValid);
+ },
+ _criteriaChanged: function(criteria)
+ {
+ this._criteriaConditionChanged();
if (criteria && criteria.get("removed"))
{
var prev = this.criteriaMatchCondition;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org