Merge pull request #14484 from nextcloud/fix/users-and-groups/vue-multiselect
Fix/users and groups/vue multiselect
This commit is contained in:
commit
b41ae8c98a
File diff suppressed because one or more lines are too long
|
@ -1,115 +1,5 @@
|
||||||
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
|
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
|
||||||
|
|
||||||
/***/ "./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu.vue?vue&type=script&lang=js&":
|
|
||||||
/*!************************************************************************************************************************************************************!*\
|
|
||||||
!*** ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./settings/src/components/popoverMenu.vue?vue&type=script&lang=js& ***!
|
|
||||||
\************************************************************************************************************************************************************/
|
|
||||||
/*! exports provided: default */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _popoverMenu_popoverItem__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./popoverMenu/popoverItem */ "./settings/src/components/popoverMenu/popoverItem.vue");
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
|
|
||||||
/* harmony default export */ __webpack_exports__["default"] = ({
|
|
||||||
name: 'popoverMenu',
|
|
||||||
props: ['menu'],
|
|
||||||
components: {
|
|
||||||
popoverItem: _popoverMenu_popoverItem__WEBPACK_IMPORTED_MODULE_0__["default"]
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu/popoverItem.vue?vue&type=script&lang=js&":
|
|
||||||
/*!************************************************************************************************************************************************************************!*\
|
|
||||||
!*** ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./settings/src/components/popoverMenu/popoverItem.vue?vue&type=script&lang=js& ***!
|
|
||||||
\************************************************************************************************************************************************************************/
|
|
||||||
/*! exports provided: default */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
/* harmony default export */ __webpack_exports__["default"] = ({
|
|
||||||
props: ['item']
|
|
||||||
});
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js?!./settings/src/components/userList.vue?vue&type=script&lang=js&":
|
/***/ "./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js?!./settings/src/components/userList.vue?vue&type=script&lang=js&":
|
||||||
/*!*********************************************************************************************************************************************************!*\
|
/*!*********************************************************************************************************************************************************!*\
|
||||||
!*** ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./settings/src/components/userList.vue?vue&type=script&lang=js& ***!
|
!*** ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./settings/src/components/userList.vue?vue&type=script&lang=js& ***!
|
||||||
|
@ -120,8 +10,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
"use strict";
|
"use strict";
|
||||||
__webpack_require__.r(__webpack_exports__);
|
__webpack_require__.r(__webpack_exports__);
|
||||||
/* harmony import */ var _userList_userRow__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./userList/userRow */ "./settings/src/components/userList/userRow.vue");
|
/* harmony import */ var _userList_userRow__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./userList/userRow */ "./settings/src/components/userList/userRow.vue");
|
||||||
/* harmony import */ var vue_multiselect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vue-multiselect */ "./node_modules/vue-multiselect/dist/vue-multiselect.min.js");
|
/* harmony import */ var nextcloud_vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! nextcloud-vue */ "./node_modules/nextcloud-vue/dist/ncvuecomponents.js");
|
||||||
/* harmony import */ var vue_multiselect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(vue_multiselect__WEBPACK_IMPORTED_MODULE_1__);
|
/* harmony import */ var nextcloud_vue__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(nextcloud_vue__WEBPACK_IMPORTED_MODULE_1__);
|
||||||
/* harmony import */ var vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vue-infinite-loading */ "./node_modules/vue-infinite-loading/dist/vue-infinite-loading.js");
|
/* harmony import */ var vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vue-infinite-loading */ "./node_modules/vue-infinite-loading/dist/vue-infinite-loading.js");
|
||||||
/* harmony import */ var vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2__);
|
/* harmony import */ var vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2__);
|
||||||
/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.runtime.esm.js");
|
/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.runtime.esm.js");
|
||||||
|
@ -271,7 +161,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
props: ['users', 'showConfig', 'selectedGroup', 'externalActions'],
|
props: ['users', 'showConfig', 'selectedGroup', 'externalActions'],
|
||||||
components: {
|
components: {
|
||||||
userRow: _userList_userRow__WEBPACK_IMPORTED_MODULE_0__["default"],
|
userRow: _userList_userRow__WEBPACK_IMPORTED_MODULE_0__["default"],
|
||||||
Multiselect: vue_multiselect__WEBPACK_IMPORTED_MODULE_1___default.a,
|
Multiselect: nextcloud_vue__WEBPACK_IMPORTED_MODULE_1__["Multiselect"],
|
||||||
InfiniteLoading: vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2___default.a
|
InfiniteLoading: vue_infinite_loading__WEBPACK_IMPORTED_MODULE_2___default.a
|
||||||
},
|
},
|
||||||
data: function data() {
|
data: function data() {
|
||||||
|
@ -583,13 +473,12 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
__webpack_require__.r(__webpack_exports__);
|
__webpack_require__.r(__webpack_exports__);
|
||||||
/* harmony import */ var _popoverMenu__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../popoverMenu */ "./settings/src/components/popoverMenu.vue");
|
/* harmony import */ var vue_click_outside__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue-click-outside */ "./node_modules/vue-click-outside/index.js");
|
||||||
/* harmony import */ var vue_click_outside__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vue-click-outside */ "./node_modules/vue-click-outside/index.js");
|
/* harmony import */ var vue_click_outside__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue_click_outside__WEBPACK_IMPORTED_MODULE_0__);
|
||||||
/* harmony import */ var vue_click_outside__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(vue_click_outside__WEBPACK_IMPORTED_MODULE_1__);
|
/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.runtime.esm.js");
|
||||||
/* harmony import */ var vue_multiselect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vue-multiselect */ "./node_modules/vue-multiselect/dist/vue-multiselect.min.js");
|
/* harmony import */ var v_tooltip__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! v-tooltip */ "./node_modules/v-tooltip/dist/v-tooltip.esm.js");
|
||||||
/* harmony import */ var vue_multiselect__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue_multiselect__WEBPACK_IMPORTED_MODULE_2__);
|
/* harmony import */ var nextcloud_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! nextcloud-vue */ "./node_modules/nextcloud-vue/dist/ncvuecomponents.js");
|
||||||
/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.runtime.esm.js");
|
/* harmony import */ var nextcloud_vue__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(nextcloud_vue__WEBPACK_IMPORTED_MODULE_3__);
|
||||||
/* harmony import */ var v_tooltip__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! v-tooltip */ "./node_modules/v-tooltip/dist/v-tooltip.esm.js");
|
|
||||||
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
|
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -720,21 +609,21 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
vue__WEBPACK_IMPORTED_MODULE_1__["default"].use(v_tooltip__WEBPACK_IMPORTED_MODULE_2__["default"]);
|
||||||
vue__WEBPACK_IMPORTED_MODULE_3__["default"].use(v_tooltip__WEBPACK_IMPORTED_MODULE_4__["default"]);
|
|
||||||
/* harmony default export */ __webpack_exports__["default"] = ({
|
/* harmony default export */ __webpack_exports__["default"] = ({
|
||||||
name: 'userRow',
|
name: 'userRow',
|
||||||
props: ['user', 'settings', 'groups', 'subAdminsGroups', 'quotaOptions', 'showConfig', 'languages', 'externalActions'],
|
props: ['user', 'settings', 'groups', 'subAdminsGroups', 'quotaOptions', 'showConfig', 'languages', 'externalActions'],
|
||||||
components: {
|
components: {
|
||||||
popoverMenu: _popoverMenu__WEBPACK_IMPORTED_MODULE_0__["default"],
|
PopoverMenu: nextcloud_vue__WEBPACK_IMPORTED_MODULE_3__["PopoverMenu"],
|
||||||
Multiselect: vue_multiselect__WEBPACK_IMPORTED_MODULE_2___default.a
|
Multiselect: nextcloud_vue__WEBPACK_IMPORTED_MODULE_3__["Multiselect"]
|
||||||
},
|
},
|
||||||
directives: {
|
directives: {
|
||||||
ClickOutside: vue_click_outside__WEBPACK_IMPORTED_MODULE_1___default.a
|
ClickOutside: vue_click_outside__WEBPACK_IMPORTED_MODULE_0___default.a
|
||||||
},
|
},
|
||||||
mounted: function mounted() {// required if popup needs to stay opened after menu click
|
mounted: function mounted() {// required if popup needs to stay opened after menu click
|
||||||
// since we only have disable/delete actions, let's close it directly
|
// since we only have disable/delete actions, let's close it directly
|
||||||
|
@ -1718,101 +1607,6 @@ vue__WEBPACK_IMPORTED_MODULE_2__["default"].use(vue_localstorage__WEBPACK_IMPORT
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu.vue?vue&type=template&id=c00791f8&":
|
|
||||||
/*!**************************************************************************************************************************************************************************************************************!*\
|
|
||||||
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./settings/src/components/popoverMenu.vue?vue&type=template&id=c00791f8& ***!
|
|
||||||
\**************************************************************************************************************************************************************************************************************/
|
|
||||||
/*! exports provided: render, staticRenderFns */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
|
|
||||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
|
|
||||||
var render = function() {
|
|
||||||
var _vm = this
|
|
||||||
var _h = _vm.$createElement
|
|
||||||
var _c = _vm._self._c || _h
|
|
||||||
return _c(
|
|
||||||
"ul",
|
|
||||||
_vm._l(_vm.menu, function(item, key) {
|
|
||||||
return _c("popover-item", { key: key, attrs: { item: item } })
|
|
||||||
}),
|
|
||||||
1
|
|
||||||
)
|
|
||||||
}
|
|
||||||
var staticRenderFns = []
|
|
||||||
render._withStripped = true
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu/popoverItem.vue?vue&type=template&id=6bb28f66&":
|
|
||||||
/*!**************************************************************************************************************************************************************************************************************************!*\
|
|
||||||
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./settings/src/components/popoverMenu/popoverItem.vue?vue&type=template&id=6bb28f66& ***!
|
|
||||||
\**************************************************************************************************************************************************************************************************************************/
|
|
||||||
/*! exports provided: render, staticRenderFns */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
|
|
||||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
|
|
||||||
var render = function() {
|
|
||||||
var _vm = this
|
|
||||||
var _h = _vm.$createElement
|
|
||||||
var _c = _vm._self._c || _h
|
|
||||||
return _c("li", [
|
|
||||||
_vm.item.href
|
|
||||||
? _c(
|
|
||||||
"a",
|
|
||||||
{
|
|
||||||
attrs: {
|
|
||||||
href: _vm.item.href ? _vm.item.href : "#",
|
|
||||||
target: _vm.item.target ? _vm.item.target : "",
|
|
||||||
rel: "noreferrer noopener"
|
|
||||||
},
|
|
||||||
on: { click: _vm.item.action }
|
|
||||||
},
|
|
||||||
[
|
|
||||||
_c("span", { class: _vm.item.icon }),
|
|
||||||
_vm._v(" "),
|
|
||||||
_vm.item.text
|
|
||||||
? _c("span", [_vm._v(_vm._s(_vm.item.text))])
|
|
||||||
: _vm.item.longtext
|
|
||||||
? _c("p", [_vm._v(_vm._s(_vm.item.longtext))])
|
|
||||||
: _vm._e()
|
|
||||||
]
|
|
||||||
)
|
|
||||||
: _vm.item.action
|
|
||||||
? _c("button", { on: { click: _vm.item.action } }, [
|
|
||||||
_c("span", { class: _vm.item.icon }),
|
|
||||||
_vm._v(" "),
|
|
||||||
_vm.item.text
|
|
||||||
? _c("span", [_vm._v(_vm._s(_vm.item.text))])
|
|
||||||
: _vm.item.longtext
|
|
||||||
? _c("p", [_vm._v(_vm._s(_vm.item.longtext))])
|
|
||||||
: _vm._e()
|
|
||||||
])
|
|
||||||
: _c("span", { staticClass: "menuitem" }, [
|
|
||||||
_c("span", { class: _vm.item.icon }),
|
|
||||||
_vm._v(" "),
|
|
||||||
_vm.item.text
|
|
||||||
? _c("span", [_vm._v(_vm._s(_vm.item.text))])
|
|
||||||
: _vm.item.longtext
|
|
||||||
? _c("p", [_vm._v(_vm._s(_vm.item.longtext))])
|
|
||||||
: _vm._e()
|
|
||||||
])
|
|
||||||
])
|
|
||||||
}
|
|
||||||
var staticRenderFns = []
|
|
||||||
render._withStripped = true
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./settings/src/components/userList.vue?vue&type=template&id=1347754e&":
|
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./settings/src/components/userList.vue?vue&type=template&id=1347754e&":
|
||||||
|
@ -2109,7 +1903,8 @@ var render = function() {
|
||||||
"track-by": "id",
|
"track-by": "id",
|
||||||
multiple: true,
|
multiple: true,
|
||||||
taggable: true,
|
taggable: true,
|
||||||
"close-on-select": false
|
"close-on-select": false,
|
||||||
|
"tag-width": 60
|
||||||
},
|
},
|
||||||
on: { tag: _vm.createGroup },
|
on: { tag: _vm.createGroup },
|
||||||
model: {
|
model: {
|
||||||
|
@ -2147,7 +1942,8 @@ var render = function() {
|
||||||
label: "name",
|
label: "name",
|
||||||
"track-by": "id",
|
"track-by": "id",
|
||||||
multiple: true,
|
multiple: true,
|
||||||
"close-on-select": false
|
"close-on-select": false,
|
||||||
|
"tag-width": 60
|
||||||
},
|
},
|
||||||
model: {
|
model: {
|
||||||
value: _vm.newUser.subAdminsGroups,
|
value: _vm.newUser.subAdminsGroups,
|
||||||
|
@ -2553,7 +2349,8 @@ var render = function() {
|
||||||
limit: 2,
|
limit: 2,
|
||||||
multiple: true,
|
multiple: true,
|
||||||
taggable: _vm.settings.isAdmin,
|
taggable: _vm.settings.isAdmin,
|
||||||
closeOnSelect: false
|
closeOnSelect: false,
|
||||||
|
"tag-width": 60
|
||||||
},
|
},
|
||||||
on: {
|
on: {
|
||||||
tag: _vm.createGroup,
|
tag: _vm.createGroup,
|
||||||
|
@ -2613,7 +2410,8 @@ var render = function() {
|
||||||
"track-by": "id",
|
"track-by": "id",
|
||||||
limit: 2,
|
limit: 2,
|
||||||
multiple: true,
|
multiple: true,
|
||||||
closeOnSelect: false
|
closeOnSelect: false,
|
||||||
|
"tag-width": 60
|
||||||
},
|
},
|
||||||
on: {
|
on: {
|
||||||
select: _vm.addUserSubAdmin,
|
select: _vm.addUserSubAdmin,
|
||||||
|
@ -3106,144 +2904,6 @@ render._withStripped = true
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./settings/src/components/popoverMenu.vue":
|
|
||||||
/*!*************************************************!*\
|
|
||||||
!*** ./settings/src/components/popoverMenu.vue ***!
|
|
||||||
\*************************************************/
|
|
||||||
/*! exports provided: default */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _popoverMenu_vue_vue_type_template_id_c00791f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./popoverMenu.vue?vue&type=template&id=c00791f8& */ "./settings/src/components/popoverMenu.vue?vue&type=template&id=c00791f8&");
|
|
||||||
/* harmony import */ var _popoverMenu_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./popoverMenu.vue?vue&type=script&lang=js& */ "./settings/src/components/popoverMenu.vue?vue&type=script&lang=js&");
|
|
||||||
/* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* normalize component */
|
|
||||||
|
|
||||||
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
|
|
||||||
_popoverMenu_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
|
|
||||||
_popoverMenu_vue_vue_type_template_id_c00791f8___WEBPACK_IMPORTED_MODULE_0__["render"],
|
|
||||||
_popoverMenu_vue_vue_type_template_id_c00791f8___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
|
|
||||||
false,
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
null
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
/* hot reload */
|
|
||||||
if (false) { var api; }
|
|
||||||
component.options.__file = "settings/src/components/popoverMenu.vue"
|
|
||||||
/* harmony default export */ __webpack_exports__["default"] = (component.exports);
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./settings/src/components/popoverMenu.vue?vue&type=script&lang=js&":
|
|
||||||
/*!**************************************************************************!*\
|
|
||||||
!*** ./settings/src/components/popoverMenu.vue?vue&type=script&lang=js& ***!
|
|
||||||
\**************************************************************************/
|
|
||||||
/*! exports provided: default */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverMenu_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/babel-loader/lib!../../../node_modules/vue-loader/lib??vue-loader-options!./popoverMenu.vue?vue&type=script&lang=js& */ "./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu.vue?vue&type=script&lang=js&");
|
|
||||||
/* empty/unused harmony star reexport */ /* harmony default export */ __webpack_exports__["default"] = (_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverMenu_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__["default"]);
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./settings/src/components/popoverMenu.vue?vue&type=template&id=c00791f8&":
|
|
||||||
/*!********************************************************************************!*\
|
|
||||||
!*** ./settings/src/components/popoverMenu.vue?vue&type=template&id=c00791f8& ***!
|
|
||||||
\********************************************************************************/
|
|
||||||
/*! exports provided: render, staticRenderFns */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverMenu_vue_vue_type_template_id_c00791f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/vue-loader/lib??vue-loader-options!./popoverMenu.vue?vue&type=template&id=c00791f8& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu.vue?vue&type=template&id=c00791f8&");
|
|
||||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverMenu_vue_vue_type_template_id_c00791f8___WEBPACK_IMPORTED_MODULE_0__["render"]; });
|
|
||||||
|
|
||||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverMenu_vue_vue_type_template_id_c00791f8___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./settings/src/components/popoverMenu/popoverItem.vue":
|
|
||||||
/*!*************************************************************!*\
|
|
||||||
!*** ./settings/src/components/popoverMenu/popoverItem.vue ***!
|
|
||||||
\*************************************************************/
|
|
||||||
/*! exports provided: default */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _popoverItem_vue_vue_type_template_id_6bb28f66___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./popoverItem.vue?vue&type=template&id=6bb28f66& */ "./settings/src/components/popoverMenu/popoverItem.vue?vue&type=template&id=6bb28f66&");
|
|
||||||
/* harmony import */ var _popoverItem_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./popoverItem.vue?vue&type=script&lang=js& */ "./settings/src/components/popoverMenu/popoverItem.vue?vue&type=script&lang=js&");
|
|
||||||
/* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* normalize component */
|
|
||||||
|
|
||||||
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
|
|
||||||
_popoverItem_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
|
|
||||||
_popoverItem_vue_vue_type_template_id_6bb28f66___WEBPACK_IMPORTED_MODULE_0__["render"],
|
|
||||||
_popoverItem_vue_vue_type_template_id_6bb28f66___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
|
|
||||||
false,
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
null
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
/* hot reload */
|
|
||||||
if (false) { var api; }
|
|
||||||
component.options.__file = "settings/src/components/popoverMenu/popoverItem.vue"
|
|
||||||
/* harmony default export */ __webpack_exports__["default"] = (component.exports);
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./settings/src/components/popoverMenu/popoverItem.vue?vue&type=script&lang=js&":
|
|
||||||
/*!**************************************************************************************!*\
|
|
||||||
!*** ./settings/src/components/popoverMenu/popoverItem.vue?vue&type=script&lang=js& ***!
|
|
||||||
\**************************************************************************************/
|
|
||||||
/*! exports provided: default */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverItem_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/babel-loader/lib!../../../../node_modules/vue-loader/lib??vue-loader-options!./popoverItem.vue?vue&type=script&lang=js& */ "./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu/popoverItem.vue?vue&type=script&lang=js&");
|
|
||||||
/* empty/unused harmony star reexport */ /* harmony default export */ __webpack_exports__["default"] = (_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverItem_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__["default"]);
|
|
||||||
|
|
||||||
/***/ }),
|
|
||||||
|
|
||||||
/***/ "./settings/src/components/popoverMenu/popoverItem.vue?vue&type=template&id=6bb28f66&":
|
|
||||||
/*!********************************************************************************************!*\
|
|
||||||
!*** ./settings/src/components/popoverMenu/popoverItem.vue?vue&type=template&id=6bb28f66& ***!
|
|
||||||
\********************************************************************************************/
|
|
||||||
/*! exports provided: render, staticRenderFns */
|
|
||||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
__webpack_require__.r(__webpack_exports__);
|
|
||||||
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverItem_vue_vue_type_template_id_6bb28f66___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../node_modules/vue-loader/lib??vue-loader-options!./popoverItem.vue?vue&type=template&id=6bb28f66& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./settings/src/components/popoverMenu/popoverItem.vue?vue&type=template&id=6bb28f66&");
|
|
||||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverItem_vue_vue_type_template_id_6bb28f66___WEBPACK_IMPORTED_MODULE_0__["render"]; });
|
|
||||||
|
|
||||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_popoverItem_vue_vue_type_template_id_6bb28f66___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
/***/ "./settings/src/components/userList.vue":
|
/***/ "./settings/src/components/userList.vue":
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,50 +0,0 @@
|
||||||
<!--
|
|
||||||
- @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
-
|
|
||||||
- @author John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
-
|
|
||||||
- @license GNU AGPL version 3 or any later version
|
|
||||||
-
|
|
||||||
- This program is free software: you can redistribute it and/or modify
|
|
||||||
- it under the terms of the GNU Affero General Public License as
|
|
||||||
- published by the Free Software Foundation, either version 3 of the
|
|
||||||
- License, or (at your option) any later version.
|
|
||||||
-
|
|
||||||
- This program is distributed in the hope that it will be useful,
|
|
||||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
- GNU Affero General Public License for more details.
|
|
||||||
-
|
|
||||||
- You should have received a copy of the GNU Affero General Public License
|
|
||||||
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
-
|
|
||||||
-->
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<li>
|
|
||||||
<!-- If item.href is set, a link will be directly used -->
|
|
||||||
<a @click="item.action" v-if="item.href" :href="(item.href) ? item.href : '#' " :target="(item.target) ? item.target : '' " rel="noreferrer noopener">
|
|
||||||
<span :class="item.icon"></span>
|
|
||||||
<span v-if="item.text">{{item.text}}</span>
|
|
||||||
<p v-else-if="item.longtext">{{item.longtext}}</p>
|
|
||||||
</a>
|
|
||||||
<!-- If item.action is set instead, a button will be used -->
|
|
||||||
<button @click="item.action" v-else-if="item.action">
|
|
||||||
<span :class="item.icon"></span>
|
|
||||||
<span v-if="item.text">{{item.text}}</span>
|
|
||||||
<p v-else-if="item.longtext">{{item.longtext}}</p>
|
|
||||||
</button>
|
|
||||||
<!-- If item.longtext is set AND the item does not have an action -->
|
|
||||||
<span class="menuitem" v-else>
|
|
||||||
<span :class="item.icon"></span>
|
|
||||||
<span v-if="item.text">{{item.text}}</span>
|
|
||||||
<p v-else-if="item.longtext">{{item.longtext}}</p>
|
|
||||||
</span>
|
|
||||||
</li>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
props: ['item']
|
|
||||||
};
|
|
||||||
</script>
|
|
|
@ -80,7 +80,7 @@
|
||||||
tag-placeholder="create" :placeholder="t('settings', 'Add user in group')"
|
tag-placeholder="create" :placeholder="t('settings', 'Add user in group')"
|
||||||
label="name" track-by="id" class="multiselect-vue"
|
label="name" track-by="id" class="multiselect-vue"
|
||||||
:multiple="true" :taggable="true" :close-on-select="false"
|
:multiple="true" :taggable="true" :close-on-select="false"
|
||||||
@tag="createGroup">
|
:tag-width="60" @tag="createGroup">
|
||||||
<!-- If user is not admin, he is a subadmin.
|
<!-- If user is not admin, he is a subadmin.
|
||||||
Subadmins can't create users outside their groups
|
Subadmins can't create users outside their groups
|
||||||
Therefore, empty select is forbidden -->
|
Therefore, empty select is forbidden -->
|
||||||
|
@ -91,7 +91,7 @@
|
||||||
<multiselect :options="subAdminsGroups" v-model="newUser.subAdminsGroups"
|
<multiselect :options="subAdminsGroups" v-model="newUser.subAdminsGroups"
|
||||||
:placeholder="t('settings', 'Set user as admin for')"
|
:placeholder="t('settings', 'Set user as admin for')"
|
||||||
label="name" track-by="id" class="multiselect-vue"
|
label="name" track-by="id" class="multiselect-vue"
|
||||||
:multiple="true" :close-on-select="false">
|
:multiple="true" :close-on-select="false" :tag-width="60">
|
||||||
<span slot="noResult">{{t('settings', 'No results')}}</span>
|
<span slot="noResult">{{t('settings', 'No results')}}</span>
|
||||||
</multiselect>
|
</multiselect>
|
||||||
</div>
|
</div>
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import userRow from './userList/userRow';
|
import userRow from './userList/userRow';
|
||||||
import Multiselect from 'vue-multiselect';
|
import { Multiselect } from 'nextcloud-vue'
|
||||||
import InfiniteLoading from 'vue-infinite-loading';
|
import InfiniteLoading from 'vue-infinite-loading';
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
|
|
||||||
|
|
|
@ -73,6 +73,7 @@
|
||||||
tag-placeholder="create" :placeholder="t('settings', 'Add user in group')"
|
tag-placeholder="create" :placeholder="t('settings', 'Add user in group')"
|
||||||
label="name" track-by="id" class="multiselect-vue" :limit="2"
|
label="name" track-by="id" class="multiselect-vue" :limit="2"
|
||||||
:multiple="true" :taggable="settings.isAdmin" :closeOnSelect="false"
|
:multiple="true" :taggable="settings.isAdmin" :closeOnSelect="false"
|
||||||
|
:tag-width="60"
|
||||||
@tag="createGroup" @select="addUserGroup" @remove="removeUserGroup">
|
@tag="createGroup" @select="addUserGroup" @remove="removeUserGroup">
|
||||||
<span slot="limit" class="multiselect__limit" v-tooltip.auto="formatGroupsTitle(userGroups)">+{{userGroups.length-2}}</span>
|
<span slot="limit" class="multiselect__limit" v-tooltip.auto="formatGroupsTitle(userGroups)">+{{userGroups.length-2}}</span>
|
||||||
<span slot="noResult">{{t('settings', 'No results')}}</span>
|
<span slot="noResult">{{t('settings', 'No results')}}</span>
|
||||||
|
@ -82,7 +83,7 @@
|
||||||
<multiselect :value="userSubAdminsGroups" :options="subAdminsGroups" :disabled="loading.subadmins||loading.all"
|
<multiselect :value="userSubAdminsGroups" :options="subAdminsGroups" :disabled="loading.subadmins||loading.all"
|
||||||
:placeholder="t('settings', 'Set user as admin for')"
|
:placeholder="t('settings', 'Set user as admin for')"
|
||||||
label="name" track-by="id" class="multiselect-vue" :limit="2"
|
label="name" track-by="id" class="multiselect-vue" :limit="2"
|
||||||
:multiple="true" :closeOnSelect="false"
|
:multiple="true" :closeOnSelect="false" :tag-width="60"
|
||||||
@select="addUserSubAdmin" @remove="removeUserSubAdmin">
|
@select="addUserSubAdmin" @remove="removeUserSubAdmin">
|
||||||
<span slot="limit" class="multiselect__limit" v-tooltip.auto="formatGroupsTitle(userSubAdminsGroups)">+{{userSubAdminsGroups.length-2}}</span>
|
<span slot="limit" class="multiselect__limit" v-tooltip.auto="formatGroupsTitle(userSubAdminsGroups)">+{{userSubAdminsGroups.length-2}}</span>
|
||||||
<span slot="noResult">{{t('settings', 'No results')}}</span>
|
<span slot="noResult">{{t('settings', 'No results')}}</span>
|
||||||
|
@ -127,11 +128,10 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import popoverMenu from '../popoverMenu';
|
|
||||||
import ClickOutside from 'vue-click-outside';
|
import ClickOutside from 'vue-click-outside';
|
||||||
import Multiselect from 'vue-multiselect';
|
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import VTooltip from 'v-tooltip'
|
import VTooltip from 'v-tooltip'
|
||||||
|
import { PopoverMenu, Multiselect } from 'nextcloud-vue'
|
||||||
|
|
||||||
Vue.use(VTooltip)
|
Vue.use(VTooltip)
|
||||||
|
|
||||||
|
@ -139,7 +139,7 @@ export default {
|
||||||
name: 'userRow',
|
name: 'userRow',
|
||||||
props: ['user', 'settings', 'groups', 'subAdminsGroups', 'quotaOptions', 'showConfig', 'languages', 'externalActions'],
|
props: ['user', 'settings', 'groups', 'subAdminsGroups', 'quotaOptions', 'showConfig', 'languages', 'externalActions'],
|
||||||
components: {
|
components: {
|
||||||
popoverMenu,
|
PopoverMenu,
|
||||||
Multiselect
|
Multiselect
|
||||||
},
|
},
|
||||||
directives: {
|
directives: {
|
||||||
|
|
Loading…
Reference in New Issue