@concretecms/bedrock 1.5.1 → 1.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -74,15 +74,23 @@ export default {
|
|
|
74
74
|
searchKeywords: '',
|
|
75
75
|
searchResults: [],
|
|
76
76
|
searchSubmitted: false,
|
|
77
|
-
treeID: 0
|
|
77
|
+
treeID: 0,
|
|
78
|
+
guestGroupTreeNodeID: null,
|
|
79
|
+
registeredGroupTreeNodeID: null
|
|
78
80
|
}
|
|
79
81
|
},
|
|
80
82
|
watch: {
|
|
81
83
|
treeID: function() {
|
|
82
84
|
var my = this
|
|
85
|
+
var removeNodesByKey = []
|
|
86
|
+
if (this.guestGroupTreeNodeID !== null && this.registeredGroupTreeNodeID !== null) {
|
|
87
|
+
removeNodesByKey.push(this.guestGroupTreeNodeID)
|
|
88
|
+
removeNodesByKey.push(this.registeredGroupTreeNodeID)
|
|
89
|
+
}
|
|
83
90
|
var options = {
|
|
84
91
|
treeID: my.treeID,
|
|
85
|
-
enableDragAndDrop: false
|
|
92
|
+
enableDragAndDrop: false,
|
|
93
|
+
removeNodesByKey: removeNodesByKey
|
|
86
94
|
}
|
|
87
95
|
if (my.mode === 'select') {
|
|
88
96
|
options.onClick = function(node) {
|
|
@@ -112,7 +120,9 @@ export default {
|
|
|
112
120
|
ccm_token: CCM_SECURITY_TOKEN
|
|
113
121
|
},
|
|
114
122
|
success: function (r) {
|
|
115
|
-
my.
|
|
123
|
+
my.guestGroupTreeNodeID = r.guestGroupTreeNodeID
|
|
124
|
+
my.registeredGroupTreeNodeID = r.registeredGroupTreeNodeID
|
|
125
|
+
my.treeID = r.tree.treeID
|
|
116
126
|
}
|
|
117
127
|
})
|
|
118
128
|
},
|
|
@@ -138,6 +148,7 @@ export default {
|
|
|
138
148
|
url: CCM_DISPATCHER_FILENAME + '/ccm/system/group/chooser/search',
|
|
139
149
|
method: 'POST',
|
|
140
150
|
data: {
|
|
151
|
+
filter: 'assign',
|
|
141
152
|
ccm_token: CCM_SECURITY_TOKEN,
|
|
142
153
|
keywords: my.searchKeywords
|
|
143
154
|
},
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
if (window.innerWidth > 992) {
|
|
5
5
|
document.querySelectorAll('.ccm-block-top-navigation-bar .nav-item').forEach(function(everyitem) {
|
|
6
6
|
everyitem.addEventListener('mouseover', function(e) {
|
|
7
|
-
const linkElement = this.querySelector('a[data-
|
|
7
|
+
const linkElement = this.querySelector('a[data-bs-toggle]')
|
|
8
8
|
if (linkElement != null) {
|
|
9
9
|
const nextElement = linkElement.nextElementSibling
|
|
10
10
|
linkElement.classList.add('show')
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
}
|
|
13
13
|
})
|
|
14
14
|
everyitem.addEventListener('mouseleave', function(e) {
|
|
15
|
-
const linkElement = this.querySelector('a[data-
|
|
15
|
+
const linkElement = this.querySelector('a[data-bs-toggle]')
|
|
16
16
|
if (linkElement != null) {
|
|
17
17
|
const nextElement = linkElement.nextElementSibling
|
|
18
18
|
linkElement.classList.remove('show')
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
})
|
|
22
22
|
})
|
|
23
23
|
} else {
|
|
24
|
-
$('a[data-
|
|
24
|
+
$('a[data-bs-toggle]').on('click', function(e) {
|
|
25
25
|
if (!$(this).hasClass('show')) {
|
|
26
26
|
e.preventDefault()
|
|
27
27
|
const $nextElement = $(this).next()
|
package/package.json
CHANGED