Discource-C
/
discourse-data-explorer
mirror of https://github.com/discourse/discourse-data-explorer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "DEV: Migrate from {{user-selector}} to {{email-group-user-chooser}} (#94)" (#102)" (#103) 

Follow-up to https://github.com/discourse/discourse-data-explorer/pull/102. This is essentially a revert of that PR, the only difference is that the `.discourse-compatibility` file now pins the plugin to 60ffd4bc4d for sites ≤ `2.7.0.beta3`.
This commit is contained in:
Osama Sayegh 2021-03-06 20:16:49 +03:00 committed by GitHub
parent 60ffd4bc4d
commit 8ef3fa38d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.discourse-compatibility
View File

@ -1 +1,2 @@
2.7.0.beta3: 60ffd4bc4d357b365cdb8a6764cec621f2edcf81
2.6.0.beta2: 16873e708a3c924549e77f3fea011069358d1511 2.6.0.beta2: 16873e708a3c924549e77f3fea011069358d1511

4
assets/javascripts/discourse/models/query.js.es6
View File

@ -47,6 +47,10 @@ const Query = RestModel.extend({
newParams[name] = pinfo["default"]; newParams[name] = pinfo["default"];
} else if (pinfo["type"] === "boolean") { } else if (pinfo["type"] === "boolean") {
newParams[name] = "false"; newParams[name] = "false";
} else if (pinfo["type"] === "user_id") {
newParams[name] = null;
} else if (pinfo["type"] === "user_list") {
newParams[name] = null;
} else { } else {
newParams[name] = ""; newParams[name] = "";
} }

8
assets/javascripts/discourse/templates/admin/components/q-params/user_id.hbs
View File

@ -1,2 +1,8 @@
{{user-selector usernames=value single="true"}} {{email-group-user-chooser
value=value
options=(hash
maximum=1
)
onChange=(action (mut value))
}}
<span class="param-name">{{info.identifier}}</span> <span class="param-name">{{info.identifier}}</span>

5
assets/javascripts/discourse/templates/admin/components/q-params/user_list.hbs
View File

@ -1,2 +1,5 @@
{{user-selector usernames=value}} {{email-group-user-chooser
value=value
onChange=(action (mut value))
}}
<span class="param-name">{{info.identifier}}</span> <span class="param-name">{{info.identifier}}</span>