CollectionField

contain filter in place of start on display name in dnn user data source
sachatrauwaen · May 16, 2023 · fa0f751 · fa0f751
1 parent 8881b2d
commit fa0f751
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 4 deletions.
diff --git a/OpenContent/Components/Datasource/DnnUsersDataSource.cs b/OpenContent/Components/Datasource/DnnUsersDataSource.cs
@@ -140,7 +140,7 @@ public override IDataItems GetAll(DataSourceContext context, Select selectQuery)
 
                     if (ruleDisplayName != null)
                     {
-                        string displayName = ruleDisplayName.Value.AsString + "%";
+                        string displayName = "%"+ruleDisplayName.Value.AsString + "%";
                         users = UserController.GetUsersByDisplayName(context.PortalId, displayName, pageIndex, pageSize, ref total, true, false).Cast<UserInfo>();
                     }
                     else

diff --git a/OpenContent/OpenContent.csproj b/OpenContent/OpenContent.csproj
@@ -1281,6 +1281,7 @@
     <Content Include="js\summernote\font\summernote.woff" />
     <Content Include="js\swagger\fonts\DroidSans-Bold.ttf" />
     <Content Include="js\swagger\fonts\DroidSans.ttf" />
+    <Content Include="lama\src\components\CollectionField.vue" />
     <None Include="packages.config" />
     <None Include="Scripts\_references.js" />
     <Content Include="js\select2\select2.css" />

diff --git a/OpenContent/js/lamaengine.js b/OpenContent/js/lamaengine.js
@@ -386,13 +386,14 @@ alpacaEngine.engine = function (config) {
 
                 } else if (config.query.type == "relation") {
                     var postData = {
+                        "collection": config.query.collection,
                         "dataKey": config.query.dataKey,
                         "valueField": config.query.valueField,
                         "textField": config.query.textField
                     };
                     $.ajax({
                         //url: self.sf.getServiceRoot(self.options.dataService.module) + self.options.dataService.controller + "/" + self.options.dataService.action,
-                        url: self.sf.getServiceRoot("OpenContent") + "OpenContentAPI" + "/" + "LookupData",
+                        url: self.sf.getServiceRoot("OpenContent") + "OpenContentAPI" + "/" + config.query.action,
                         beforeSend: self.sf.setModuleHeaders,
 
                         type: "post",

diff --git a/OpenContent/lama/dist/js/app.js b/OpenContent/lama/dist/js/app.js