@concretecms/bedrock 1.5.1 → 1.5.3
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.
|
@@ -57,6 +57,11 @@ export default {
|
|
|
57
57
|
components: {
|
|
58
58
|
},
|
|
59
59
|
props: {
|
|
60
|
+
filter: {
|
|
61
|
+
type: String,
|
|
62
|
+
required: false,
|
|
63
|
+
default: '' /* Values are either "" or "assign". If assign, we strip out faux-groups like "Guest" and "Registered Users" */
|
|
64
|
+
},
|
|
60
65
|
mode: {
|
|
61
66
|
type: String,
|
|
62
67
|
required: false,
|
|
@@ -74,15 +79,23 @@ export default {
|
|
|
74
79
|
searchKeywords: '',
|
|
75
80
|
searchResults: [],
|
|
76
81
|
searchSubmitted: false,
|
|
77
|
-
treeID: 0
|
|
82
|
+
treeID: 0,
|
|
83
|
+
guestGroupTreeNodeID: null,
|
|
84
|
+
registeredGroupTreeNodeID: null
|
|
78
85
|
}
|
|
79
86
|
},
|
|
80
87
|
watch: {
|
|
81
88
|
treeID: function() {
|
|
82
89
|
var my = this
|
|
90
|
+
var removeNodesByKey = []
|
|
91
|
+
if (this.filter === 'assign' && this.guestGroupTreeNodeID !== null && this.registeredGroupTreeNodeID !== null) {
|
|
92
|
+
removeNodesByKey.push(this.guestGroupTreeNodeID)
|
|
93
|
+
removeNodesByKey.push(this.registeredGroupTreeNodeID)
|
|
94
|
+
}
|
|
83
95
|
var options = {
|
|
84
96
|
treeID: my.treeID,
|
|
85
|
-
enableDragAndDrop: false
|
|
97
|
+
enableDragAndDrop: false,
|
|
98
|
+
removeNodesByKey: removeNodesByKey
|
|
86
99
|
}
|
|
87
100
|
if (my.mode === 'select') {
|
|
88
101
|
options.onClick = function(node) {
|
|
@@ -112,7 +125,9 @@ export default {
|
|
|
112
125
|
ccm_token: CCM_SECURITY_TOKEN
|
|
113
126
|
},
|
|
114
127
|
success: function (r) {
|
|
115
|
-
my.
|
|
128
|
+
my.guestGroupTreeNodeID = r.guestGroupTreeNodeID
|
|
129
|
+
my.registeredGroupTreeNodeID = r.registeredGroupTreeNodeID
|
|
130
|
+
my.treeID = r.tree.treeID
|
|
116
131
|
}
|
|
117
132
|
})
|
|
118
133
|
},
|
|
@@ -138,6 +153,7 @@ export default {
|
|
|
138
153
|
url: CCM_DISPATCHER_FILENAME + '/ccm/system/group/chooser/search',
|
|
139
154
|
method: 'POST',
|
|
140
155
|
data: {
|
|
156
|
+
filter: my.filter,
|
|
141
157
|
ccm_token: CCM_SECURITY_TOKEN,
|
|
142
158
|
keywords: my.searchKeywords
|
|
143
159
|
},
|
package/assets/icons/sprites.svg
CHANGED
|
@@ -146,11 +146,7 @@
|
|
|
146
146
|
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
147
147
|
<g id="Page-1" stroke="none" stroke-width="1" fill-rule="evenodd">
|
|
148
148
|
<g id="Dialog---Add-Page-List" transform="translate(-1021.000000, -105.000000)">
|
|
149
|
-
<
|
|
150
|
-
<use xlink:href="#path-1"></use>
|
|
151
|
-
</mask>
|
|
152
|
-
<use id="Rectangle" fill-opacity="0.6" xlink:href="#path-1"></use>
|
|
153
|
-
<g id="Group" mask="url(#mask-2)">
|
|
149
|
+
<g id="Group">
|
|
154
150
|
<g transform="translate(315.000000, 80.000000)">
|
|
155
151
|
<g id="icons8-info-(1)" stroke-width="1" fill="none" fill-rule="evenodd"
|
|
156
152
|
transform="translate(706.000000, 25.000000)">
|
package/package.json
CHANGED