Apps/MobileApp
2
1
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Fix bug where account switching failed to actually switch accounts

Browse Source
This commit is contained in:
Skylar Ittner 2018-12-22 12:28:19 -07:00
parent 07614c76f6
commit d006684147
4 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nbproject/build.xml
View File

@ -46,7 +46,7 @@ made subject to such option by the copyright holder.
<!-- <!--
Generated file; DO NOT EDIT. Generated file; DO NOT EDIT.
--> -->
<project name="BusinessMobile" basedir=".."> <project name="NetsymsMobile" basedir="..">
<property file="nbproject/configs/${config}.properties" /> <property file="nbproject/configs/${config}.properties" />
<scriptdef name="checkVersion" language="javascript"> <scriptdef name="checkVersion" language="javascript">

8
nbproject/project.properties
View File

@ -1,8 +1,8 @@
auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52 auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52
auxiliary.org-netbeans-modules-cordova.phonegap=false auxiliary.org-netbeans-modules-cordova.phonegap=false
file.reference.BusinessMobile-test=test file.reference.NetsymsMobile-test=test
file.reference.BusinessMobile-www=www file.reference.NetsymsMobile-www=www
files.encoding=UTF-8 files.encoding=UTF-8
project.licensePath=nbproject/mplheader.txt project.licensePath=nbproject/mplheader.txt
site.root.folder=${file.reference.BusinessMobile-www} site.root.folder=${file.reference.NetsymsMobile-www}
test.folder=${file.reference.BusinessMobile-test} test.folder=${file.reference.NetsymsMobile-test}

6
www/js/accounts.js
View File

@ -49,14 +49,14 @@ function recoveraccounts(callback) {
/** /**
* Switch to a different account. * Switch to a different account.
* @param {int} account The selected account index from localStorage.getItem('accounts') * @param {int} account The selected account index from localStorage.getItem('accounts')
* @param {boolean} showmsg Whether to show the "switched accounts" alert dialog. Default True. * @param {boolean} showmsg [HAS NO EFFECT] Whether to show the "switched accounts" alert dialog. Default True.
* @returns {undefined} * @returns {undefined}
*/ */
function switchaccount(account, showmsg) { function switchaccount(account, showmsg) {
if (typeof showmsg != 'boolean') { if (typeof showmsg != 'boolean') {
showmsg = true; showmsg = true;
} }
// If there isn't an accounts list yet, this shouldi take us back to the setup // If there isn't an accounts list yet, this should take us back to the setup
if (!isconfigvalid()) { if (!isconfigvalid()) {
restartApplication(); restartApplication();
} }
@ -74,7 +74,7 @@ function switchaccount(account, showmsg) {
restartApplication(); restartApplication();
if (showmsg == true) { if (showmsg == true) {
navigator.notification.alert("Successfully switched accounts.", null, "Switched", 'OK'); //navigator.notification.alert("Successfully switched accounts.", null, "Switched", 'OK');
} }
} }

2
www/pages/accounts.html
View File

@ -21,7 +21,7 @@
<ul id="accountlist"> <ul id="accountlist">
{{#each accounts}} {{#each accounts}}
<li class="swipeout accountlist-item" data-id="{{id}}"> <li class="swipeout accountlist-item" data-id="{{id}}">
<div class="item-content swipeout-content"> <div class="item-content swipeout-content" data-id="{{id}}">
<div class="item-media"><img src="img/accounticons/{{icon}}.svg" width="44"/></div> <div class="item-media"><img src="img/accounticons/{{icon}}.svg" width="44"/></div>
<div class="item-inner"> <div class="item-inner">
<div class="item-title-row"> <div class="item-title-row">