Merge remote-tracking branch 'upstream/master'

2014-05-01 14:12:17 +01:00
parent b4fc3e1cd3 6ea44c271d
commit 518f68951d
1 changed files with 3 additions and 2 deletions
@@ -93,7 +93,8 @@
    //helper that returns if an item can be removed
    $scope.canRemove = function ()
    {
-        return countVisible() > 1
+        return countVisible() > 1 
+            || ($scope.model.config.maxFieldsets == 1 && $scope.model.config.fieldsets.length > 1)
            || $scope.model.config.startWithAddButton;
    }

@@ -107,7 +108,7 @@
    $scope.showAddButton = function () {
        return $scope.model.config.startWithAddButton
            && countVisible() === 0
-            && !$scope.model.config.enableMultipleFieldsets;
+            && $scope.model.config.fieldsets.length == 1;
    }

    //helper, ini the render model from the server (model.value)