Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-16 09:18:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-order for correct flow

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-07-06 22:31:17 +02:00
parent 2560f27e51
commit 1088649fc3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UI/FormManager.js
View File

@ -157,6 +157,14 @@
injects = form.getSubmitInjects(), injects = form.getSubmitInjects(),
counter = 0; counter = 0;
// todo: test if attach necessary (maybe already attached in event manager)
// Register normal form behavior
this.app.eventManager.attach(form.getId(), function ()
{
self.submitForm(form);
});
// Run all injects first
for (let property in injects) { for (let property in injects) {
if (injects.hasOwnProperty(property)) { if (injects.hasOwnProperty(property)) {
counter++; counter++;
@ -166,12 +174,6 @@
this.app.logger.warning('Invalid property.'); this.app.logger.warning('Invalid property.');
} }
} }
this.app.eventManager.attach(form.getId(), function ()
{
self.submitForm(form);
});
this.app.eventManager.trigger('?', form.getId());
}; };
/** /**
@ -186,6 +188,7 @@
*/ */
jsOMS.UI.FormManager.prototype.submitForm = function (form) jsOMS.UI.FormManager.prototype.submitForm = function (form)
{ {
console.log('triggered');
if (!form.isValid()) { if (!form.isValid()) {
this.app.logger.debug('Form "' + form.getId() + '" has invalid values.'); this.app.logger.debug('Form "' + form.getId() + '" has invalid values.');
return; return;
@ -220,7 +223,6 @@
} }
} }
} catch (e) { } catch (e) {
console.log(e);
self.app.logger.error('Invalid form response. \n' + self.app.logger.error('Invalid form response. \n' +
'URL: ' + form.getAction() + '\n' + 'URL: ' + form.getAction() + '\n' +
'Request: ' + JSON.stringify(form.getData()) + '\n' + 'Request: ' + JSON.stringify(form.getData()) + '\n' +