diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-10 17:55:08 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-16 09:50:24 +0200 |
| commit | a62c796f0709dacc332b7d9328e3f6ab151991f3 (patch) | |
| tree | f707321be045956c54f819217d0ee44a2d7eff15 /settings/src | |
| parent | 170746dadae678d02657515206ac4c96976c8173 (diff) | |
| download | nextcloud-server-a62c796f0709dacc332b7d9328e3f6ab151991f3.tar.gz nextcloud-server-a62c796f0709dacc332b7d9328e3f6ab151991f3.zip | |
Production build, router base url fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/userList.vue | 2 | ||||
| -rw-r--r-- | settings/src/components/userList/userRow.vue | 2 | ||||
| -rw-r--r-- | settings/src/router.js | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue index 05aa1f520db..18d3609a163 100644 --- a/settings/src/components/userList.vue +++ b/settings/src/components/userList.vue @@ -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; diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue index c6394832fd4..e6edc5e4f6a 100644 --- a/settings/src/components/userList/userRow.vue +++ b/settings/src/components/userList/userRow.vue @@ -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> diff --git a/settings/src/router.js b/settings/src/router.js index 783e466b94f..32893b188bb 100644 --- a/settings/src/router.js +++ b/settings/src/router.js @@ -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', |