Browse Source

Merge pull request #14935 from nextcloud/fix/settings/use-components-multiselect

Fix/settings/use components multiselect
pull/14934/head
Morris Jobke 7 years ago
committed by GitHub
parent
commit
854cb5d3d1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      settings/js/vue-0.js
  2. 2
      settings/js/vue-0.js.map
  3. 2
      settings/js/vue-4.js
  4. 2
      settings/js/vue-4.js.map
  5. 4
      settings/js/vue-6.js
  6. 2
      settings/js/vue-6.js.map
  7. 2
      settings/js/vue-7.js
  8. 2
      settings/js/vue-7.js.map
  9. 2
      settings/js/vue-settings-apps-users-management.js
  10. 2
      settings/js/vue-settings-apps-users-management.js.map
  11. 4
      settings/src/components/appDetails.vue
  12. 2
      settings/src/components/appList.vue
  13. 2
      settings/src/components/appList/appItem.vue

16
settings/js/vue-0.js
File diff suppressed because it is too large
View File

2
settings/js/vue-0.js.map
File diff suppressed because it is too large
View File

2
settings/js/vue-4.js
File diff suppressed because it is too large
View File

2
settings/js/vue-4.js.map
File diff suppressed because it is too large
View File

4
settings/js/vue-6.js
File diff suppressed because it is too large
View File

2
settings/js/vue-6.js.map
File diff suppressed because it is too large
View File

2
settings/js/vue-7.js
File diff suppressed because it is too large
View File

2
settings/js/vue-7.js.map
File diff suppressed because it is too large
View File

2
settings/js/vue-settings-apps-users-management.js
File diff suppressed because it is too large
View File

2
settings/js/vue-settings-apps-users-management.js.map
File diff suppressed because it is too large
View File

4
settings/src/components/appDetails.vue

@ -62,7 +62,7 @@
:placeholder="t('settings', 'Limit app usage to groups')"
label="name" track-by="id" class="multiselect-vue"
:multiple="true" :close-on-select="false"
@search-change="asyncFindGroup">
:tag-width="60" @search-change="asyncFindGroup">
<span slot="noResult">{{t('settings', 'No results')}}</span>
</multiselect>
</div>
@ -96,7 +96,7 @@
</template>
<script>
import Multiselect from 'vue-multiselect';
import { Multiselect } from 'nextcloud-vue';
import marked from 'marked';
import dompurify from 'dompurify'

2
settings/src/components/appList.vue

@ -73,7 +73,6 @@
<script>
import appItem from './appList/appItem';
import Multiselect from 'vue-multiselect';
import prefix from './prefixMixin';
export default {
@ -81,7 +80,6 @@ export default {
mixins: [prefix],
props: ['category', 'app', 'search'],
components: {
Multiselect,
appItem
},
computed: {

2
settings/src/components/appList/appItem.vue

@ -61,7 +61,6 @@
</template>
<script>
import Multiselect from 'vue-multiselect';
import AppScore from './appScore';
import AppManagement from '../appManagement';
import SvgFilterMixin from '../svgFilterMixin';
@ -83,7 +82,6 @@
}
},
components: {
Multiselect,
AppScore,
},
data() {

Loading…
Cancel
Save