Skip to content

Commit b48ed6f

Browse files
DavidBlaaDavidBlaa
committed
Merge branch 'rc' of https://github.com/BEXIS2/Core into rc
2 parents 566cfe5 + e448bbd commit b48ed6f

File tree

8 files changed

+145
-76
lines changed

8 files changed

+145
-76
lines changed

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/BExIS.Modules.SMM.UI.csproj‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7676
<HintPath>..\..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
7777
</Reference>
78-
<Reference Include="System.Web.Mvc, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<HintPath>..\..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll</HintPath>
78+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<HintPath>..\..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
8080
</Reference>
8181
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8282
<HintPath>..\..\..\..\..\packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll</HintPath>
@@ -93,6 +93,10 @@
9393
</Reference>
9494
<Reference Include="System.Xml" />
9595
<Reference Include="System.Xml.Linq" />
96+
<Reference Include="Telerik.Web.Mvc, Version=2013.2.611.340, Culture=neutral, PublicKeyToken=29ac1a93ec063d92, processorArchitecture=MSIL">
97+
<SpecificVersion>False</SpecificVersion>
98+
<HintPath>..\..\..\..\..\packages\TelerikMvcExtensions.2013.2.611\lib\net40\Telerik.Web.Mvc.dll</HintPath>
99+
</Reference>
96100
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97101
<HintPath>..\..\..\..\..\packages\Microsoft.AspNet.WebPages.Data.3.2.9\lib\net45\WebMatrix.Data.dll</HintPath>
98102
</Reference>
@@ -101,6 +105,7 @@
101105
</Reference>
102106
</ItemGroup>
103107
<ItemGroup>
108+
<Compile Include="Controllers\HomeController.cs" />
104109
<Compile Include="Helpers\SMMSeedDataGenerator.cs" />
105110
<Compile Include="Helpers\SettingsHelper.cs" />
106111
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -139,6 +144,7 @@
139144
<Content Include="Views\_ViewStart.cshtml" />
140145
<Content Include="Web.config" />
141146
<Content Include="SMM.Settings.json" />
147+
<Content Include="Views\Home\Index.cshtml" />
142148
<None Include="Web.Debug.config">
143149
<DependentUpon>Web.config</DependentUpon>
144150
</None>
@@ -151,7 +157,6 @@
151157
</ItemGroup>
152158
<ItemGroup>
153159
<Folder Include="Content\Images\help\" />
154-
<Folder Include="Controllers\" />
155160
<Folder Include="Models\" />
156161
<Folder Include="Views\Shared\" />
157162
</ItemGroup>

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/Controllers/HomeController.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.Web.Mvc;
2+
using Vaiona.Web.Mvc;
3+
using Telerik.Web.Mvc;
4+
using Telerik.Web.Mvc.Extensions;
5+
using System;
6+
7+
namespace BExIS.Modules.Smm.UI.Controllers
8+
{
9+
public class HomeController : BaseController
10+
{
11+
public ActionResult Index()
12+
{
13+
return View();
14+
}
15+
}
16+
}

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/Helpers/SMMSeedDataGenerator.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using BExIS.Dlm.Entities.Party;
22
using BExIS.Dlm.Services.Party;
3+
using BExIS.Security.Services.Authorization;
34
using BExIS.Security.Services.Objects;
45
using System;
56
using System.Collections.Generic;
@@ -16,6 +17,12 @@ public class SMMSeedDataGenerator : IDisposable
1617
{
1718
public void GenerateSeedData()
1819
{
20+
// Operations
21+
using (OperationManager operationManager = new OperationManager())
22+
{
23+
var homeController = operationManager.Find("SMM", "Home", "*") ?? operationManager.Create("SMM", "Home", "*");
24+
}
25+
1926

2027
}
2128

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/SMM.Manifest.xml‎

Lines changed: 98 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,108 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<Manifest moduleId="SMM" displayName="Business Administration Module" version="1.0.0" builtin="false">
2+
<Manifest moduleId="SMM" displayName="Species Mapping Module" version="1.0.0" builtin="true">
33
<Description>
4-
BAM provides the ability to work with objects such as Party Package. All the packages related to the core of system belong to this module.
5-
</Description>
4+
...
5+
</Description>
66
<Assemblies>
77
<Assembly fullName="" role="" />
88
</Assemblies>
99
<Dependencies>
10-
<!--<Dependency moduleId="dcm" version="*.*.*" />-->
10+
<Dependency moduleId="dcm" version="*.*.*" />
1111
</Dependencies>
1212
<Exports>
13-
<!--add proper menu items-->
14-
15-
<!--<Export tag="settings" id="createDataset" order="1"
16-
title="Manage Parties" description="" icon=""
17-
controller="Party" action="index"
18-
extends="./settingsRoot" />-->
19-
20-
<!-- INTERNAL-->
21-
22-
<!--<Export tag="internalApi" id="loadFromPartyUserRegisterationForm"
23-
title="Load From Party User Registration Form" description="Load FromParty User Registration Form" icon=""
24-
controller="PartyService" action="UserRegistration"
25-
extends="" />
26-
<Export tag="internalApi" id="GetPartyTypesForAccount"
27-
title="Get partyTypes for account" description="Get partyTypes for account which are defined in setting.xml" icon=""
28-
controller="PartyService" action="GetPartyTypesForAccount"
29-
extends="" />-->
30-
<Export tag="lunchbar" id="helpSmm" order="2"
31-
title="Account / Parties" description="Parties Help Manual" icon=""
32-
controller="Help" action="index"
33-
extends="./lunchbarRoot/help" />
34-
<!-- Settings Example-->
35-
<!--<Export tag="settings" id="manageMetadata" order="1"
36-
title="Manage Metadata Structure" description="Edit or Importa new Metadata Structure" icon=""
37-
controller="ManageMetadataStructure" action="Index" argument=""
38-
extends="./settingsRoot"
39-
/>-->
40-
<!-- Menubar Example-->
41-
<!--<Export tag="menubar" id="createDataset" order="1"
42-
title="Create Dataset" description="Create new Dataset" icon=""
43-
controller="CreateDataset" action="index"
44-
extends="./menubarRoot/collect" />-->
45-
46-
<!-- Api Example-->
47-
<!-- <Export tag="api" id="tntList"
48-
title="No thing" description="Change me!" icon=""
49-
controller="home" action="index"
50-
extends="./apiRoot"
51-
/>-->
13+
<!--
14+
<Export tag="settings" id="usrList" order="1"
15+
title="Manage Users" description="List Only users without groups" icon=""
16+
controller="subjets" action="index" argument="user"
17+
extends="./settingsRoot" />
18+
-->
19+
<!--<Export tag="settings" id="modules" order="5"
20+
title="Manage Modules" description="Manage Modules" icon=""
21+
controller="modules" action="index" argument="Modules"
22+
extends="./settingsRoot" />-->
23+
<!--<Export tag="settings" id="datasets" order="6"
24+
title="Manage Datasets" description="Manage Datasets" icon=""
25+
controller="datasets" action="index" argument="Datasets"
26+
extends="./settingsRoot" />
27+
28+
<Export tag="settings" id="datasets" order="7"
29+
title="Manage Requests" description="Manage Requests" icon=""
30+
controller="requestsadmin" action="index" argument="Manage Requests"
31+
extends="./settingsRoot" />-->
32+
33+
<!--<Export tag="settings" id="datasets" order="8"
34+
title="Manage Documents" description="Manage Documents" icon=""
35+
controller="Files" action="index" argument="Manage Documents"
36+
extends="./settingsRoot" />-->
37+
38+
<!--<Export tag="settings" id="datasets" order="9"
39+
title="Files List" description="Files List" icon=""
40+
controller="Files" action="FileList" argument="Files list"
41+
extends="./settingsRoot" />-->
42+
43+
<!--<Export tag="lunchbar" id="helpSam" order="7"
44+
title="Administration" description="Administration Help Manual" icon=""
45+
controller="help" action="index"
46+
extends="./lunchbarRoot/help" />
47+
48+
<Export tag="settings" id="formerMember" order="15"
49+
title="Manage Former Member" description="" icon=""
50+
controller="FormerMember" action="Index"
51+
extends="./settingsRoot" />-->
52+
53+
<!-- internal api -->
54+
55+
<!--<Export tag="internalApi" id="userPermissions_subjects"
56+
title="User Permissions - Subjects" description="User Permissions - Subjects" icon=""
57+
controller="UserPermissions" action="Subjects"
58+
extends="" />
59+
60+
<Export tag="internalApi" id="entityPermissions_add"
61+
title="Entity Permissions - Subjects" description="Entity Permissions - Add" icon=""
62+
controller="EntityPermissions" action="AddRightToEntityPermission"
63+
extends="" />
64+
65+
<Export tag="internalApi" id="entityPermissions_remove"
66+
title="Entity Permissions - Subjects" description="Entity Permissions - Remove" icon=""
67+
controller="EntityPermissions" action="RemoveRightFromEntityPermission"
68+
extends="" />
69+
70+
<Export tag="internalApi" id="loadRequests"
71+
title="load requests overview" description="load the overview if requests based on entity and user" icon=""
72+
controller="requests" action="requests"
73+
extends="" />
74+
75+
<Export tag="internalApi" id="loadDecisions"
76+
title="load decisions overview" description="load the overview if decisions based on entity and user" icon=""
77+
controller="requests" action="decisions"
78+
extends="" />
79+
80+
--><!-- api --><!--
81+
82+
<Export tag="api" id="tntList"
83+
title="List Tenants" description="List tenants and their status" icon=""
84+
controller="tenants" action="index"
85+
extends="./apiRoot" />-->
5286
</Exports>
87+
88+
<!-- fill out alle the hook aatributes otherwise there will not be loaded -->
89+
<Hooks>
90+
<!--<Hook
91+
name="permission"
92+
displayName="Permissions"
93+
mode="view"
94+
entity="dataset"
95+
place="details"
96+
module="sam"
97+
type="BExIS.Modules.Sam.UI.Hooks.UserPermissionsHook, BExIS.Modules.SAM.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />-->
98+
99+
<!--<Hook
100+
name="permission"
101+
displayName="Permissions"
102+
mode="edit"
103+
entity="dataset"
104+
place="details"
105+
module="sam"
106+
type="BExIS.Modules.Sam.UI.Hooks.UserPermissionsHook, BExIS.Modules.SAM.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />-->
107+
</Hooks>
53108
</Manifest>

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/SMMModule.cs‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
using Vaiona.Logging;
44
using Vaiona.Web.Mvc.Modularity;
55

6-
namespace BExIS.Modules.SMM.UI
6+
namespace BExIS.Modules.Smm.UI
77
{
88
public class SmmModule : ModuleBase
99
{
10-
public SmmModule() : base("Smm")
10+
public SmmModule() : base("smm")
1111
{
12-
LoggerFactory.GetFileLogger().LogCustom("...ctor of Smm...");
12+
LoggerFactory.GetFileLogger().LogCustom("...ctor of smm...");
1313
}
1414

1515
public override void Install()
1616
{
17-
LoggerFactory.GetFileLogger().LogCustom("...start install of Smm...");
17+
LoggerFactory.GetFileLogger().LogCustom("...start install of smm...");
1818
try
1919
{
2020
base.Install();
21-
using (SMMSeedDataGenerator generator = new SMMSeedDataGenerator())
21+
22+
using (var generator = new SMMSeedDataGenerator())
2223
{
2324
generator.GenerateSeedData();
2425
}
@@ -29,29 +30,7 @@ public override void Install()
2930
LoggerFactory.GetFileLogger().LogCustom(e.StackTrace);
3031
}
3132

32-
LoggerFactory.GetFileLogger().LogCustom("...end install of Smm...");
33+
LoggerFactory.GetFileLogger().LogCustom("...end install of smm...");
3334
}
34-
35-
/// <summary>
36-
/// Registers current area with the routing engine.
37-
/// The default route is automatically registred. Using the AreaName as route prefix and url sapce.
38-
/// </summary>
39-
/// <remarks>
40-
/// <list type="number">
41-
/// <item>If you are happy with the defaul route, either leave the method as is or comment it all (prefered).</item>
42-
/// <item>if you want to register other than the default, comment the call to the base method and write your own ones.</item>
43-
/// <item>If you want to register additional routes, write them after the call to the base method.</item>
44-
/// </list>
45-
/// </remarks>
46-
/// <param name="context"></param>
47-
//public override void RegisterArea(AreaRegistrationContext context)
48-
//{
49-
// base.RegisterArea(context);
50-
// //context.MapRoute(
51-
// // AreaName + "_default",
52-
// // AreaName+"/{controller}/{action}/{id}",
53-
// // new { action = "Index", id = UrlParameter.Optional }
54-
// //);
55-
//}
5635
}
5736
}

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/Views/Home/Index.cshtml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
@{
3+
ViewBag.Title = "Index";
4+
}
5+
6+
<h2>Index</h2>
7+

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="5.2.8" targetFramework="net48" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net48" />
44
<package id="Microsoft.AspNet.Razor" version="3.2.9" targetFramework="net48" />
55
<package id="Microsoft.AspNet.WebHelpers" version="3.2.8" targetFramework="net48" />
66
<package id="Microsoft.AspNet.WebPages" version="3.2.9" targetFramework="net48" />

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</dependentAssembly>
7373
<dependentAssembly>
7474
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
75-
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
75+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
7676
</dependentAssembly>
7777
</assemblyBinding>
7878
</runtime>

0 commit comments

Comments
 (0)