Skip to content

Commit 671478f

Browse files
author
ActiveDbSoft
committed
3.3.7
1 parent 7887022 commit 671478f

File tree

26 files changed

+122
-79
lines changed

26 files changed

+122
-79
lines changed

‎CookieStorage/CookieStorage.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,13 @@
178178
</ItemGroup>
179179
<ItemGroup>
180180
<Reference Include="ActiveQueryBuilder.Core">
181-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.8.1115\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
181+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.12.1120\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
182182
</Reference>
183183
<Reference Include="ActiveQueryBuilder.View">
184-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.6\lib\net\ActiveQueryBuilder.View.dll</HintPath>
184+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.View.dll</HintPath>
185185
</Reference>
186186
<Reference Include="ActiveQueryBuilder.Web.Server">
187-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.6\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
187+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
188188
</Reference>
189189
</ItemGroup>
190190
<PropertyGroup>

‎CookieStorage/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CookieStorage/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ActiveQueryBuilder.Core" version="3.5.8.1115" targetFramework="net40" />
4-
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
5-
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
6-
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
7-
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.6" targetFramework="net40" />
3+
<package id="ActiveQueryBuilder.Core" version="3.5.12.1120" targetFramework="net40" />
4+
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
5+
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
6+
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
7+
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.7" targetFramework="net40" />
88
<package id="Antlr" version="3.4.1.9004" targetFramework="net461" />
99
<package id="bootstrap" version="3.0.0" targetFramework="net461" />
1010
<package id="jQuery" version="1.10.2" targetFramework="net461" />

‎CrossDomain/CrossDomain.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@
186186
</ItemGroup>
187187
<ItemGroup>
188188
<Reference Include="ActiveQueryBuilder.Core">
189-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.8.1115\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
189+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.12.1120\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
190190
</Reference>
191191
<Reference Include="ActiveQueryBuilder.Web.Server">
192-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.6\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
192+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
193193
</Reference>
194194
</ItemGroup>
195195
<PropertyGroup>

‎CrossDomain/FrontEnd/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CrossDomain/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ActiveQueryBuilder.Core" version="3.5.8.1115" targetFramework="net40" />
4-
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
5-
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
6-
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
7-
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.6" targetFramework="net40" />
3+
<package id="ActiveQueryBuilder.Core" version="3.5.12.1120" targetFramework="net40" />
4+
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
5+
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
6+
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
7+
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.7" targetFramework="net40" />
88
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
99
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
1010
<package id="jQuery" version="1.10.2" targetFramework="net45" />

‎CustomStorage/CustomStorage.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,19 @@
210210
</ItemGroup>
211211
<ItemGroup>
212212
<Reference Include="ActiveQueryBuilder.SQLiteMetadataProvider">
213-
<HintPath>..\packages\ActiveQueryBuilder.SQLiteMetadataProvider.3.5.8.1115\lib\net\ActiveQueryBuilder.SQLiteMetadataProvider.dll</HintPath>
213+
<HintPath>..\packages\ActiveQueryBuilder.SQLiteMetadataProvider.3.5.12.1120\lib\net\ActiveQueryBuilder.SQLiteMetadataProvider.dll</HintPath>
214214
</Reference>
215215
<Reference Include="ActiveQueryBuilder.Core">
216-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.8.1115\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
216+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.12.1120\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
217217
</Reference>
218218
<Reference Include="ActiveQueryBuilder.View">
219-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.6\lib\net\ActiveQueryBuilder.View.dll</HintPath>
219+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.View.dll</HintPath>
220220
</Reference>
221221
<Reference Include="ActiveQueryBuilder.Web.MVC">
222-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.6\lib\net\ActiveQueryBuilder.Web.MVC.dll</HintPath>
222+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.Web.MVC.dll</HintPath>
223223
</Reference>
224224
<Reference Include="ActiveQueryBuilder.Web.Server">
225-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.6\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
225+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.7\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
226226
</Reference>
227227
</ItemGroup>
228228
<PropertyGroup>

‎CustomStorage/Views/QueryResultsDemo/Index.cshtml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
140140
onCriteriaBuilderChanged(cb,
141141
function () {
142-
var params = AQB.Web.QueryBuilder.queryParams;
142+
var params = getUniqueQueryParams();
143143
clearParams();
144144
145145
if (params.length) {
@@ -190,7 +190,7 @@
190190
191191
function getParams() {
192192
var result = [];
193-
var params = AQB.Web.QueryBuilder.queryParams;
193+
var params = getUniqueQueryParams();
194194
195195
for (var i = 0; i < params.length; i++) {
196196
result.push({
@@ -289,5 +289,19 @@
289289
AQB.Web.QueryBuilder.update();
290290
}).fail(errorCallback);
291291
}
292+
293+
function getUniqueQueryParams() {
294+
var params = AQB.Web.QueryBuilder.queryParams;
295+
var result = [];
296+
297+
for (var i = 0, l = params.length; i < l; i++) {
298+
var param = params[i];
299+
300+
if (result.find(r => r.FullName === param.FullName) == null)
301+
result.push(param);
302+
}
303+
304+
return result;
305+
}
292306
</script>
293307
}

‎CustomStorage/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CustomStorage/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ActiveQueryBuilder.Core" version="3.5.8.1115" targetFramework="net40" />
4-
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
5-
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
6-
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.8.1115" targetFramework="net40" />
7-
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.6" targetFramework="net40" />
3+
<package id="ActiveQueryBuilder.Core" version="3.5.12.1120" targetFramework="net40" />
4+
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
5+
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
6+
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.12.1120" targetFramework="net40" />
7+
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.7" targetFramework="net40" />
88
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
99
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
1010
<package id="jQuery" version="1.10.2" targetFramework="net45" />

0 commit comments

Comments
 (0)