Commit 8bcb106f authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/raos_work' into crose_work

parents 78aa1845 23650113
......@@ -25,7 +25,7 @@ var QfqNS = QfqNS || {};
// On text input elements, we specifically bind this events, in order to update the formChanged property
// immediately, not only after loosing focus.
this.$form.find("input[type=text]").on("input paste", this.changeHandler.bind(this));
this.$form.find("input[type=text], textarea").on("input paste", this.changeHandler.bind(this));
};
n.Form.prototype.on = n.EventEmitter.onMixin;
......
......@@ -431,25 +431,39 @@ var QfqNS = QfqNS || {};
if (data['form-update']) {
this.applyElementConfiguration(data['form-update']);
}
return;
}
return;
if (data.redirect === "client") {
window.history.back();
return;
}
if (data.redirect === "url" || data['redirect-url']) {
window.location = data['redirect-url'];
return;
}
break;
case 'new':
var target = this.getNewButtonTarget();
window.location = this.getNewButtonTarget();
return;
}
if (data.redirect === "client") {
window.history.back();
return;
}
default:
if (data.redirect === "client") {
window.history.back();
return;
}
if (data.redirect === "url" || data['redirect-url']) {
window.location = data['redirect-url'];
return;
if (data.redirect === "url" || data['redirect-url']) {
window.location = data['redirect-url'];
return;
}
break;
}
};
n.QfqForm.prototype.getNewButtonTarget = function () {
......
......@@ -645,6 +645,19 @@
<p class="help-block"></p>
</div>
</div>
<div class="form-group">
<div class="col-md-2">
<label for="mytextarea" class="control-label">Text area</label>
</div>
<div class="col-md-6">
<textarea id="mytextarea" name="mytextarea"></textarea>
</div>
<div class=" col-md-4">
<p class="help-block"></p>
</div>
</div>
<!--Sekretariat fuer Arbeitsgruppe (subrecord)-->
<!--Arbeitsgruppe (subrecord)-->
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment