Merge remote-tracking branch 'upstream/master'

2014-05-07 08:22:21 +02:00
parent ff39bce262 d4d50cae52
commit 06fdfc8226
1 changed files with 2 additions and 0 deletions
@@ -15,6 +15,8 @@

    //helper to get $eval the labelTemplate
    $scope.getFieldsetTitle = function(fieldsetConfigModel, fieldsetIndex) {
+        if(!fieldsetConfigModel)
+            return "";
        var fieldset = $scope.model.value.fieldsets[fieldsetIndex];
        var fieldsetConfig = $scope.getConfigFieldsetByAlias(fieldset.alias);
        var template = fieldsetConfigModel.labelTemplate;