Skip to content

Commit aa41eec

Browse files
committed
allowing groups having no conditions
1 parent 9285a78 commit aa41eec

10 files changed

+263
-35
lines changed

dist/app/js/angular-query-builder-templates.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ angular.module("directives/search-condition.tpl.html", []).run(["$templateCache"
2222
" ng-class=\"searchConditionForm.$submitted && searchConditionForm.inputItem.$error.required ? 'aqb-input-error' : ''\" \n" +
2323
" autocomplete=\"off\" required>\n" +
2424
"\n" +
25-
" <button class=\"btn\" type=\"submit\" ng-click=\"addCondition(searchConditionForm, $event)\" ng-show=\"canAddCondition(conditionIndex)\"><i class=\"icon-plus-sign\"></i></button>\n" +
26-
" <button class=\"btn\" type=\"button\" ng-click=\"removeCondition(conditionIndex)\" ng-show=\"canRemoveCondition(conditionIndex)\"><i class=\"icon-minus-sign\"></i></button>\n" +
25+
" <button class=\"btn\" type=\"submit\" ng-click=\"addCondition(searchConditionForm)\" ng-show=\"canAddCondition(conditionIndex)\"><i class=\"icon-plus-sign\"></i></button>\n" +
26+
" <button class=\"btn\" type=\"button\" ng-click=\"removeCondition(conditionIndex)\"><i class=\"icon-minus-sign\"></i></button>\n" +
2727
"</form>");
2828
}]);
2929

@@ -53,6 +53,7 @@ angular.module("directives/search-group.tpl.html", []).run(["$templateCache", fu
5353
" </div>\n" +
5454
" <button class=\"btn\" type=\"button\" ng-click=\"addGroup()\" ng-show=\"canAddGroup()\"><i class=\"icon-plus-sign\"></i></button>\n" +
5555
" <button class=\"btn\" type=\"button\" ng-click=\"removeGroup()\" ng-show=\"canRemoveGroup()\"><i class=\"icon-minus-sign\"></i></button>\n" +
56+
" <button class=\"btn\" type=\"submit\" ng-click=\"addCondition()\" ng-show=\"group.conditions.length < 1\"><i class=\"icon-plus-sign\"></i> Condition</button>\n" +
5657
" </div>\n" +
5758
" <div class=\"aqb-horizontal-divider\"></div>\n" +
5859
" <div class=\"aqb-search-group-body\">\n" +

dist/app/js/angular-query-builder-templates.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/app/js/angular-query-builder.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-query-builder - v1.0.0 - 2015-10-29 */
1+
/*! angular-query-builder - v1.0.0 - 2015-11-25 */
22
/*! https://github.com/niklr/angular-query-builder */
33
angular.module('angular-query-builder', [
44
'ngAnimate',
@@ -165,7 +165,6 @@ angular.module('aqb.src.directives.search-condition', [])
165165
// Input items end
166166

167167
$scope.canAddCondition = $scope.$parent.canAddCondition;
168-
$scope.canRemoveCondition = $scope.$parent.canRemoveCondition;
169168
$scope.addCondition = $scope.$parent.addCondition;
170169
$scope.removeCondition = $scope.$parent.removeCondition;
171170
}],
@@ -315,21 +314,25 @@ angular.module('aqb.src.directives.search-group', ['aqb.src.helpers.recursion'])
315314
return canAddCondition;
316315
};
317316

318-
$scope.canRemoveCondition = function (index) {
319-
return $scope.group.conditions.length > 1;
320-
};
317+
$scope.addCondition = function (form) {
318+
var isValid = false;
319+
if (!!form) {
320+
if (form.$valid) {
321+
isValid = true;
322+
}
323+
}
324+
else {
325+
isValid = true;
326+
}
321327

322-
$scope.addCondition = function (form, $event) {
323-
if (form.$valid) {
328+
if (isValid) {
324329
var newCondition = {};
325330
$scope.group.conditions.push(newCondition);
326331
}
327332
};
328333

329334
$scope.removeCondition = function (index) {
330-
if ($scope.group.conditions.length > 1) {
331-
$scope.group.conditions.splice(index, 1);
332-
}
335+
$scope.group.conditions.splice(index, 1);
333336
};
334337

335338
// Condition functions end

0 commit comments

Comments
 (0)