Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2020-07-16 15:39:26 +0300
committerGeorg Ehrke <developer@georgehrke.com>2020-07-22 16:55:59 +0300
commitf217b11443bb1b4679b92320fdf66d5dd3d081c8 (patch)
treefe49091c933684293e880ec885f817817ad28189 /apps/settings/src/views
parentb73aedb81ee563f27be8fe2187983c4a757c8ca7 (diff)
Fix breaking changes of nc/vue update
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/settings/src/views')
-rw-r--r--apps/settings/src/views/Apps.vue4
-rw-r--r--apps/settings/src/views/Users.vue110
2 files changed, 58 insertions, 56 deletions
diff --git a/apps/settings/src/views/Apps.vue b/apps/settings/src/views/Apps.vue
index 6afdb2536aa..ccdb2d1b8de 100644
--- a/apps/settings/src/views/Apps.vue
+++ b/apps/settings/src/views/Apps.vue
@@ -26,7 +26,7 @@
:content-class="{ 'icon-loading': loadingList }"
:navigation-class="{ 'icon-loading': loading }">
<AppNavigation>
- <ul id="appscategories">
+ <template #list>
<AppNavigationItem
id="app-category-your-apps"
:to="{ name: 'apps' }"
@@ -84,7 +84,7 @@
id="app-developer-docs"
href="settings.developerDocumentation"
:title="t('settings', 'Developer documentation') + ' ↗'" />
- </ul>
+ </template>
</AppNavigation>
<AppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }">
<AppList :category="category" :app="currentApp" :search="searchQuery" />
diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue
index d174768fc80..0e837979b85 100644
--- a/apps/settings/src/views/Users.vue
+++ b/apps/settings/src/views/Users.vue
@@ -27,7 +27,7 @@
:text="t('settings','New user')"
button-class="icon-add"
@click="toggleNewUserMenu" />
- <ul id="usergrouplist">
+ <template #list>
<AppNavigationItem
id="addgroup"
ref="addGroup"
@@ -92,58 +92,60 @@
</ActionButton>
</template>
</AppNavigationItem>
- </ul>
- <AppNavigationSettings>
- <div>
- <p>{{ t('settings', 'Default quota:') }}</p>
- <Multiselect :value="defaultQuota"
- :options="quotaOptions"
- tag-placeholder="create"
- :placeholder="t('settings', 'Select default quota')"
- label="label"
- track-by="id"
- :allow-empty="false"
- :taggable="true"
- @tag="validateQuota"
- @input="setDefaultQuota" />
- </div>
- <div>
- <input id="showLanguages"
- v-model="showLanguages"
- type="checkbox"
- class="checkbox">
- <label for="showLanguages">{{ t('settings', 'Show Languages') }}</label>
- </div>
- <div>
- <input id="showLastLogin"
- v-model="showLastLogin"
- type="checkbox"
- class="checkbox">
- <label for="showLastLogin">{{ t('settings', 'Show last login') }}</label>
- </div>
- <div>
- <input id="showUserBackend"
- v-model="showUserBackend"
- type="checkbox"
- class="checkbox">
- <label for="showUserBackend">{{ t('settings', 'Show user backend') }}</label>
- </div>
- <div>
- <input id="showStoragePath"
- v-model="showStoragePath"
- type="checkbox"
- class="checkbox">
- <label for="showStoragePath">{{ t('settings', 'Show storage path') }}</label>
- </div>
- <div>
- <input id="sendWelcomeMail"
- v-model="sendWelcomeMail"
- :disabled="loadingSendMail"
- type="checkbox"
- class="checkbox">
- <label for="sendWelcomeMail">{{ t('settings', 'Send email to new user') }}</label>
- </div>
- </AppNavigationSettings>
+ </template>
+ <template #footer>
+ <AppNavigationSettings>
+ <div>
+ <p>{{ t('settings', 'Default quota:') }}</p>
+ <Multiselect :value="defaultQuota"
+ :options="quotaOptions"
+ tag-placeholder="create"
+ :placeholder="t('settings', 'Select default quota')"
+ label="label"
+ track-by="id"
+ :allow-empty="false"
+ :taggable="true"
+ @tag="validateQuota"
+ @input="setDefaultQuota" />
+ </div>
+ <div>
+ <input id="showLanguages"
+ v-model="showLanguages"
+ type="checkbox"
+ class="checkbox">
+ <label for="showLanguages">{{ t('settings', 'Show Languages') }}</label>
+ </div>
+ <div>
+ <input id="showLastLogin"
+ v-model="showLastLogin"
+ type="checkbox"
+ class="checkbox">
+ <label for="showLastLogin">{{ t('settings', 'Show last login') }}</label>
+ </div>
+ <div>
+ <input id="showUserBackend"
+ v-model="showUserBackend"
+ type="checkbox"
+ class="checkbox">
+ <label for="showUserBackend">{{ t('settings', 'Show user backend') }}</label>
+ </div>
+ <div>
+ <input id="showStoragePath"
+ v-model="showStoragePath"
+ type="checkbox"
+ class="checkbox">
+ <label for="showStoragePath">{{ t('settings', 'Show storage path') }}</label>
+ </div>
+ <div>
+ <input id="sendWelcomeMail"
+ v-model="sendWelcomeMail"
+ :disabled="loadingSendMail"
+ type="checkbox"
+ class="checkbox">
+ <label for="sendWelcomeMail">{{ t('settings', 'Send email to new user') }}</label>
+ </div>
+ </AppNavigationSettings>
+ </template>
</AppNavigation>
<AppContent>
<UserList #content
@@ -514,7 +516,7 @@ export default {
<style lang="scss" scoped>
// force hiding the editing action for the add group entry
-#usergrouplist #addgroup::v-deep .app-navigation-entry__utils {
+.app-navigation__list #addgroup::v-deep .app-navigation-entry__utils {
display: none;
}
</style>