Merge branch 'master' of git.math.uzh.ch:typo3/qfq

javascript/src/Element/FormGroup.js

@@ -44,11 +44,7 @@ QfqNS.Element = QfqNS.Element || {};
         this.$formGroup = this.$findFormGroup($enclosedElement);
         this.$element = this.$formGroup.find(elementSelector);
         this.$label = this.$formGroup.find('.control-label');
-        if (this.$formGroup.hasClass(".input-group")) {
-            this.$helpBlock = this.$formGroup.parent().find(".help-block");
-        } else {
-            this.$helpBlock = this.$formGroup.find(".help-block");
-        }
+        this.$helpBlock = this.$formGroup.find(".help-block");
     };
 
     /**
@@ -103,7 +99,11 @@ QfqNS.Element = QfqNS.Element || {};
         }
 
         if ($formGroup.length > 1) {
-            throw new Error("enclosed element yields ambiguous form group");
+            $formGroup = $('#' + $enclosedElement.attr('id') + '-r');
+            console.log("Enclosed Element Id: " + $enclosedElement.attr('id'));
+            if ($formGroup.length !== 1) {
+                throw new Error("enclosed element yields ambiguous form group");
+            }
         }
 
         return $formGroup;

javascript/src/QfqForm.js

@@ -293,14 +293,27 @@ var QfqNS = QfqNS || {};
     n.QfqForm.prototype.validationError = function (info) {
         var $formControl = $(info.data.element);
         var $messageContainer = $formControl.siblings('.hidden.with-errors');
+
+        if ($messageContainer.length === 0) {
+            if ($formControl.parent().hasClass('input-group')) {
+                $messageContainer = $formControl.parent().siblings('.hidden.with-errors');
+            }
+        }
+
         $messageContainer.data('qfq.hidden.message', true);
         $messageContainer.removeClass('hidden');
-
     };
 
     n.QfqForm.prototype.validationSuccess = function (info) {
         var $formControl = $(info.data.element);
         var $messageContainer = $formControl.siblings('.with-errors');
+
+        if ($messageContainer.length === 0) {
+            if ($formControl.parent().hasClass('input-group')) {
+                $messageContainer = $formControl.parent().siblings('.hidden.with-errors');
+            }
+        }
+
         if ($messageContainer.data('qfq.hidden.message') === true) {
             $messageContainer.addClass('hidden');
         }
@@ -772,7 +785,6 @@ var QfqNS = QfqNS || {};
         if (this.formImmutableDueToConcurrentAccess) {
             return;
         }
-        console.log("QFQForm Changehandler");
         this.getSaveButton().removeClass("disabled");
         this.getSaveButton().addClass(this.getSaveButtonAttentionClass());
         this.getSaveButton().removeAttr("disabled");