Skip to content

Commit 0d08567

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents 13fbe77 + f4bd76f commit 0d08567

File tree

8 files changed

+44
-16
lines changed

8 files changed

+44
-16
lines changed

‎eFormAPI/eFormAPI/Controllers/SitesController.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
using eFormApi.BasePn.Infrastructure;
99
using eFormApi.BasePn.Infrastructure.Helpers;
1010
using eFormApi.BasePn.Infrastructure.Models.API;
11+
using System.Web.Http.Cors;
12+
using eFormAPI.Web.Infrastructure.Helpers.ExchangeTokenValidation;
1113

1214
namespace eFormAPI.Web.Controllers
1315
{
@@ -25,6 +27,28 @@ public OperationDataResult<List<SiteName_Dto>> Index()
2527
return new OperationDataResult<List<SiteName_Dto>>(true, siteNamesDto);
2628
}
2729

30+
[HttpGet]
31+
[AllowAnonymous]
32+
[Route("api/sites/index/exchange/")]
33+
[EnableCors(origins: "*", headers: "content-type", methods: "GET")]
34+
public OperationDataResult<List<SiteName_Dto>> IndexExternally(string token, string callerURL)
35+
{
36+
ExchangeIdToken idToken = new ExchangeIdToken(token);
37+
IdTokenValidationResult result = idToken.Validate(callerURL);
38+
if (result.IsValid)
39+
{
40+
Core core = _coreHelper.GetCore();
41+
var siteNamesDto = core.Advanced_SiteItemReadAll(false);
42+
43+
return new OperationDataResult<List<SiteName_Dto>>(true, siteNamesDto);
44+
}
45+
else
46+
{
47+
return new OperationDataResult<List<SiteName_Dto>> (false,
48+
LocaleHelper.GetString("ErrorWhileObtainSiteList"));
49+
}
50+
}
51+
2852
[HttpGet]
2953
public OperationDataResult<SiteName_Dto> Edit(int id)
3054
{

‎eFormAPI/eFormAPI/Controllers/TemplateColumnsController.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using eFormApi.BasePn.Infrastructure;
77
using eFormApi.BasePn.Infrastructure.Helpers;
88
using eFormApi.BasePn.Infrastructure.Models.API;
9+
using eFormShared;
910

1011
namespace eFormAPI.Web.Controllers
1112
{
@@ -20,8 +21,8 @@ public OperationDataResult<List<TemplateColumnModel>> GetAvailableColumns(int te
2021
{
2122
try
2223
{
23-
var core = _coreHelper.GetCore();
24-
var fields = core.Advanced_TemplateFieldReadAll(templateId);
24+
eFormCore.Core core = _coreHelper.GetCore();
25+
List<Field_Dto> fields = core.Advanced_TemplateFieldReadAll(templateId);
2526
List<TemplateColumnModel> templateColumns = new List<TemplateColumnModel>();
2627
foreach (var field in fields)
2728
{
@@ -33,7 +34,7 @@ public OperationDataResult<List<TemplateColumnModel>> GetAvailableColumns(int te
3334
templateColumns.Add(new TemplateColumnModel()
3435
{
3536
Id = field.Id,
36-
Label = field.Label
37+
Label = field.ParentName + " - " + field.Label
3738
});
3839
}
3940
//List<TemplateColumnModel> templateColumns = fields.Select(field => new TemplateColumnModel()

‎eFormAPI/eFormAPI/Web.config‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@
101101
</dependentAssembly>
102102
<dependentAssembly>
103103
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
104-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
104+
<bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
105105
</dependentAssembly>
106106
<dependentAssembly>
107107
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
108-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
108+
<bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
109109
</dependentAssembly>
110110
<dependentAssembly>
111111
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
@@ -171,6 +171,10 @@
171171
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
172172
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
173173
</dependentAssembly>
174+
<dependentAssembly>
175+
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
176+
<bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
177+
</dependentAssembly>
174178
</assemblyBinding>
175179
</runtime>
176180
<entityFramework>

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@
133133
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134134
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
135135
</Reference>
136-
<Reference Include="Microting.eForm, Version=3.0.62.0, Culture=neutral, processorArchitecture=MSIL">
137-
<HintPath>..\packages\Microting.eForm.3.0.62\lib\net45\Microting.eForm.dll</HintPath>
136+
<Reference Include="Microting.eForm, Version=3.0.87.0, Culture=neutral, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microting.eForm.3.0.87\lib\net45\Microting.eForm.dll</HintPath>
138138
</Reference>
139-
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.43.0, Culture=neutral, processorArchitecture=MSIL">
140-
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.43\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
139+
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.46.0, Culture=neutral, processorArchitecture=MSIL">
140+
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.46\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
141141
</Reference>
142142
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
143143
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
3939
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
4040
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
41-
<package id="Microting.eForm" version="3.0.62" targetFramework="net461" />
42-
<package id="Microting.eFormApi.BasePn" version="1.1.43" targetFramework="net461" />
41+
<package id="Microting.eForm" version="3.0.87" targetFramework="net461" />
42+
<package id="Microting.eFormApi.BasePn" version="1.1.46" targetFramework="net461" />
4343
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
4444
<package id="MySql.Data" version="6.9.12" targetFramework="net461" />
4545
<package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />

‎eform-client/port/angular-bootstrap-md/scss/bootstrap/_variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ $modal-header-border-width: $modal-content-border-width !default;
795795
$modal-footer-border-width: $modal-header-border-width !default;
796796
$modal-header-padding: 1rem !default;
797797

798-
$modal-lg: 800px !default;
798+
$modal-lg: 95% !default;
799799
$modal-md: 500px !default;
800800
$modal-sm: 300px !default;
801801

‎eform-client/src/app/common/modules/eform-imported/pell/pell.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ export const init = settings => {
6666
actionbar.appendChild(button);
6767
});
6868

69-
if (settings.defaultParagraphSeparator) exec('defaultParagraphSeparator', settings.defaultParagraphSeparator)
69+
if (settings.defaultParagraphSeparator) { exec('defaultParagraphSeparator', settings.defaultParagraphSeparator); }
7070
if (settings.styleWithCSS) { exec('styleWithCSS'); }
7171

72-
7372
return settings.element;
7473
};
7574

‎eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ng-container *ngIf="dataItemList">
22
<ng-container *ngFor="let dataItem of dataItemList; let i = index">
33
<div class="card z-depth-2 mb-3" style="width: 100%" *ngIf="dataItem.fieldType != 'SaveButton'">
4-
<div class="card-header"
4+
<div class="card-header"
55
[ngStyle]="{'background-color': dataItem.color ? '#' + dataItem.color : ''}"
6-
*ngIf="dataItem.fieldType != 'FieldContainer' && dataItem.fieldType != 'SaveButton'">
6+
*ngIf="dataItem.fieldType != 'SaveButton'">
77
{{dataItem.label}}
88
</div>
99
<div class="card-body">

0 commit comments

Comments
 (0)