From 0cd6667b2864ffcbdee3bdde104d134284a0fe98 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Sat, 12 Dec 2015 15:57:56 -0700 Subject: [PATCH] * Actually use nua.js submitApplication :) --- mods/menu.hjson | 4 ++-- mods/nua.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mods/menu.hjson b/mods/menu.hjson index 8d310d8d..c11e6a39 100644 --- a/mods/menu.hjson +++ b/mods/menu.hjson @@ -207,7 +207,7 @@ *: [ { value: { "submission" : 0 } - action: @method:apply/submitApplication + action: @method:submitApplication extraArgs: { inactive: userNeedsActivated error: newUserCreateError @@ -301,7 +301,7 @@ *: [ { value: { "submission" : 0 } - action: @method:apply/submitApplication + action: @method:submitApplication extraArgs: { inactive: userNeedsActivated error: newUserCreateError diff --git a/mods/nua.js b/mods/nua.js index 87a60d7d..ca33c970 100644 --- a/mods/nua.js +++ b/mods/nua.js @@ -5,6 +5,7 @@ var user = require('../core/user.js'); var theme = require('../core/theme.js'); var login = require('../core/system_menu_method.js').login; var Config = require('../core/config.js').config; +var getDefaultMessageArea = require('../core/message_area.js').getDefaultMessageArea; var async = require('async'); @@ -76,8 +77,8 @@ function NewUserAppModule(options) { message_area_name : getDefaultMessageArea().name, - term_height : client.term.termHeight, - term_width : client.term.termWidth, + term_height : self.client.term.termHeight, + term_width : self.client.term.termWidth, // :TODO: This is set in User.create() -- proabbly don't need it here: //account_status : Config.users.requireActivation ? user.User.AccountStatus.inactive : user.User.AccountStatus.active, @@ -114,7 +115,7 @@ function NewUserAppModule(options) { }; } - if(user.User.AccountStatus.inactive === client.user.properties.account_status) { + if(user.User.AccountStatus.inactive === self.client.user.properties.account_status) { self.gotoMenu(extraArgs.inactive); } else { //