Production build, router base url fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-05-10 17:55:08 +02:00
parent 170746dada
commit a62c796f07
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
5 changed files with 29 additions and 555 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -160,7 +160,7 @@ export default {
let disabledUsers = this.users.filter(user => user.enabled !== true);
if (disabledUsers.length===0 && this.$refs.infiniteLoading && this.$refs.infiniteLoading.isComplete) {
// disabled group is empty, redirection to all users
this.$router.push('/settings/users');
this.$router.push({name: 'users'});
this.$refs.infiniteLoading.$emit('$InfiniteLoading:reset');
}
return disabledUsers;

View File

@ -9,7 +9,7 @@
<form class="displayName" :class="{'icon-loading-small': loading.displayName}" v-on:submit.prevent="updateDisplayName">
<input :id="'displayName'+user.id+rand" type="text"
:disabled="loading.displayName||loading.all"
:value="user.displayname" ref="displayName"
:value="user.displayname"
autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false" />
<input type="submit" class="icon-confirm" value="" />
</form>

View File

@ -15,6 +15,9 @@ Vue.use(Router);
export default new Router({
mode: 'history',
// if index.php is in the url AND we got this far, then it's working:
// let's keep using index.php in the url
base: window.location.pathname.indexOf('index.php') > 0 ? '/index.php/' : '/',
routes: [
{
path: '/:index(index.php/)?settings/users',