opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fix ldap/ad group webui settings (#12967) 

* Fix LDAP groups UI WIP

* fix up ldap and ad group settings

* production compiled assets
This commit is contained in:
Tony Murray 2021-06-19 09:16:02 -05:00 committed by GitHub
parent fb36f0bc60
commit 50dd6c1685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8482 additions and 5790 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/js/app.js
View File

File diff suppressed because one or more lines are too long

2
html/js/manifest.js
View File

@ -1 +1 @@
(()=>{"use strict";var e={},r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={id:n,loaded:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}t.m=e,t.x=e=>{},t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var n in r)t.o(r,n)&&!t.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:r[n]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={929:0},r=[],n=e=>{},o=(o,l)=>{for(var a,i,[u,d,f,p]=l,s=0,h=[];s<u.length;s++)i=u[s],t.o(e,i)&&e[i]&&h.push(e[i][0]),e[i]=0;for(a in d)t.o(d,a)&&(t.m[a]=d[a]);for(f&&f(t),o&&o(l);h.length;)h.shift()();return p&&r.push.apply(r,p),n()},l=self.webpackChunk=self.webpackChunk||[];function a(){for(var n,o=0;o<r.length;o++){for(var l=r[o],a=!0,i=1;i<l.length;i++){var u=l[i];0!==e[u]&&(a=!1)}a&&(r.splice(o--,1),n=t(t.s=l[0]))}return 0===r.length&&(t.x(),t.x=e=>{}),n}l.forEach(o.bind(null,0)),l.push=o.bind(null,l.push.bind(l));var i=t.x;t.x=()=>(t.x=i||(e=>{}),(n=a)())})(),t.x()})();
(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var l=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(l.exports,l,l.exports,o),l.loaded=!0,l.exports}o.m=r,e=[],o.O=(r,t,n,l)=>{if(!t){var i=1/0;for(d=0;d<e.length;d++){for(var[t,n,l]=e[d],a=!0,u=0;u<t.length;u++)(!1&l||i>=l)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,l<i&&(i=l));a&&(e.splice(d--,1),r=n())}return r}l=l||0;for(var d=e.length;d>0&&e[d-1][2]>l;d--)e[d]=e[d-1];e[d]=[t,n,l]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={929:0,170:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,l,[i,a,u]=t,d=0;for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o);for(r&&r(t);d<i.length;d++)l=i[d],o.o(e,l)&&e[l]&&e[l][0](),e[i[d]]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

2
html/js/vendor.js
View File

File diff suppressed because one or more lines are too long

8
html/js/vendor.js.LICENSE.txt
View File

@ -1,12 +1,12 @@
/*!
* Vue.js v2.6.12
* (c) 2014-2020 Evan You
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Released under the MIT License.
*/
/*!
* vue-i18n v8.22.2
* (c) 2020 kazuya kawaguchi
* vue-i18n v8.24.4
* (c) 2021 kazuya kawaguchi
* Released under the MIT License.
*/

16
html/mix-manifest.json
View File

@ -1,21 +1,13 @@
{
"/js/app.js": "/js/app.js?id=7326d976853ee518f0dc",
"/js/manifest.js": "/js/manifest.js?id=411da0f32dfa6d682e04",
"/js/app.js": "/js/app.js?id=a6bdef835406a9a4e138",
"/js/manifest.js": "/js/manifest.js?id=1514baaea419f38abb7d",
"/css/app.css": "/css/app.css?id=996b9e3da0c3ab98067e",
"/js/vendor.js": "/js/vendor.js?id=00bcb49d05c1545efab0",
"/js/lang/ar.js": "/js/lang/ar.js?id=867496e0e07ff6097886",
"/js/vendor.js": "/js/vendor.js?id=ccca9695062f1f68aaa8",
"/js/lang/de.js": "/js/lang/de.js?id=db973f6aaff0cda764c6",
"/js/lang/en.js": "/js/lang/en.js?id=fd41f6b9991c32a36645",
"/js/lang/en.js": "/js/lang/en.js?id=5fe21bec9665f75840a0",
"/js/lang/fr.js": "/js/lang/fr.js?id=096c9e010fc548e53b0a",
"/js/lang/it.js": "/js/lang/it.js?id=b28a63928155eeb4e2a1",
"/js/lang/nl.js": "/js/lang/nl.js?id=052c04cc5d1f408fcf55",
"/js/lang/pl.js": "/js/lang/pl.js?id=0cca1dde319e96cac73d",
"/js/lang/pt-br.js": "/js/lang/pt-br.js?id=cf9e6e0244e1a17fddf1",
"/js/lang/pt.js": "/js/lang/pt.js?id=38b658d49f91c95b2566",
"/js/lang/ro.js": "/js/lang/ro.js?id=55032462a25b893fa186",
"/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c",
"/js/lang/th.js": "/js/lang/th.js?id=3d5d6b9874b3ea673b3f",
"/js/lang/tr.js": "/js/lang/tr.js?id=d964e6a3e0bc51bbd7a1",
"/js/lang/uk.js": "/js/lang/uk.js?id=c19a5dcee4724579cb41",
"/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=12f95651fb6629cbf3f3",
"/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=87ab9d2f187593100bc3"

12
misc/config_definitions.json
View File

@ -384,7 +384,11 @@
"group": "auth",
"section": "ad",
"order": 4,
"type": "ldap-groups"
"type": "ldap-groups",
"validate": {
"value": "array",
"value.*": "array"
}
},
"auth_ad_user_filter": {
"default": "(objectclass=user)",
@ -508,7 +512,11 @@
"group": "auth",
"section": "ldap",
"order": 4,
"type": "ldap-groups"
"type": "ldap-groups",
"validate": {
"value": "array",
"value.*": "array"
}
},
"auth_ldap_port": {
"default": 389,

14208
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

22
resources/js/components/SettingLdapGroups.vue
View File

@ -32,7 +32,7 @@
@blur="updateItem(group, $event.target.value)"
@keyup.enter="updateItem(group, $event.target.value)"
>
<span class="input-group-btn" style="width:0;"></span>
<span class="input-group-btn" style=" width:0;"></span>
<select class="form-control" @change="updateLevel(group, $event.target.value)">
<option value="1" :selected="data.level === 1">{{ $t('Normal') }}</option>
<option value="5" :selected="data.level === 5">{{ $t('Global Read') }}</option>
@ -60,16 +60,17 @@
</template>
<script>
import BaseSetting from "./BaseSetting";
import BaseSetting from "./BaseSetting";
export default {
export default {
name: "SettingLdapGroups",
mixins: [BaseSetting],
data() {
return {
localList: this.value,
localList: Array.isArray(this.value) ? {} : this.value,
newItem: "",
newItemLevel: 1
newItemLevel: 1,
lock: false
}
},
methods: {
@ -94,7 +95,16 @@
},
watch: {
localList() {
this.$emit('input', this.localList)
if (! this.lock) {
this.$emit('input', this.localList)
} else {
// release the lock
this.lock = false;
}
},
value() {
this.lock = true // prevent loop
this.localList = Array.isArray(this.value) ? {} : this.value;
}
}
}