modals bugfixes and improvements

gulp/res/js/forms.js

@@ -56,8 +56,10 @@ class formHandler {
 		this.form = form;
 		this.enctype = this.form.getAttribute('enctype');
 		this.messageBox = form.querySelector('#message')
-		this.submit = form.querySelector('input[type="submit"]')
-		this.originalSubmitText = this.submit.value;
+		this.submit = form.querySelector('input[type="submit"]');
+		if (this.submit) {
+			this.originalSubmitText = this.submit.value;
+		}
 		this.fileInput = form.querySelector('input[type="file"]');
 		this.captcha = this.form.querySelector('img');
 		this.minimal = this.form.elements.minimal;

gulp/res/js/modal.js

@@ -54,6 +54,7 @@ pug_html = pug_html + "\u003Cli\u003E" + (pug_escape(null == (pug_interp = error
 
 }
 pug_html = pug_html + "\u003C\u002Ful\u003E\u003C\u002Fdiv\u003E";
+}
 if (data.frame) {
 pug_html = pug_html + "\u003Cdiv class=\"row\"\u003E\u003Ciframe" + (" class=\"bypass\""+" id=\"modalframe\""+pug_attr("src", data.frame, true, false)+" frameborder=\"0\" scrolling=\"no\"") + "\u003E\u003C\u002Fiframe\u003E\u003C\u002Fdiv\u003E";
 }
@@ -61,6 +62,9 @@ else
 if (data.link) {
 pug_html = pug_html + "\u003Cdiv class=\"row\"\u003E\u003Ca" + (" class=\"button mv-0\""+pug_attr("href", data.link.href, true, false)+" target=\"_blank\"") + "\u003E" + (pug_escape(null == (pug_interp = data.link.text) ? "" : pug_interp)) + "\u003C\u002Fa\u003E\u003C\u002Fdiv\u003E";
 }
+else
+if (data.redirect && data.title === 'Success') {
+pug_html = pug_html + "\u003Cdiv class=\"row\"\u003E\u003Ca" + (" class=\"button mv-0\""+pug_attr("href", data.redirect, true, false)) + "\u003EOK\u003C\u002Fa\u003E\u003C\u002Fdiv\u003E";
 }
 else
 if (data.settings) {

models/forms/changepassword.js

@@ -36,6 +36,11 @@ module.exports = async (req, res, next) => {
 
 	//change the password
 	await Accounts.changePassword(username, newPassword);
-	return res.redirect('/login.html');
+
+	return dynamicResponse(req, res, 200, 'message', {
+		'title': 'Success',
+		'message': 'Changed password',
+		'redirect': '/login.html'
+	});
 
 }

views/mixins/modal.pug

@@ -17,12 +17,15 @@ mixin modal(data)
 					if data.errors
 						each error in data.errors
 							li #{error}
-			if data.frame
-				.row
-					iframe.bypass#modalframe(src=data.frame frameborder='0' scrolling='no')
-			else if data.link
-				.row
-					a.button.mv-0(href=data.link.href target='_blank') #{data.link.text}
+		if data.frame
+			.row
+				iframe.bypass#modalframe(src=data.frame frameborder='0' scrolling='no')
+		else if data.link
+			.row
+				a.button.mv-0(href=data.link.href target='_blank') #{data.link.text}
+		else if data.redirect && data.title === 'Success'
+			.row
+				a.button.mv-0(href=data.redirect) OK
 		else if data.settings
 			.row
 				.form-wrapper.flexleft.mt-10