Merge branch 'develop'

Presentation.Web/Content/less/kitos.less

@@ -1410,4 +1410,9 @@ tr.angular-ui-tree-empty {
             color: #ccc !important;
         }
     }
+}
+
+.k-state-selected {
+    background-color: #376BB7;
+    border-color: #DBE5F1;
 }

Presentation.Web/Controllers/API/AuthorizeController.cs

@@ -105,7 +105,7 @@ public HttpResponseMessage PostLogin(LoginDTO loginDto)
             var loginInfo = new { Token="", Email = "", Password = "", LoginSuccessful = false };
 
             if (loginDto != null)
-                loginInfo = new { Token = loginInfo.Token, Email = loginDto.Email, Password = "********", LoginSuccessful = false };
+                loginInfo = new { Token = loginDto.Token, Email = loginDto.Email, Password = "********", LoginSuccessful = false };
 
             try
             {
@@ -132,7 +132,7 @@ public HttpResponseMessage PostLogin(LoginDTO loginDto)
 
                 FormsAuthentication.SetAuthCookie(user.Id.ToString(), loginDto.RememberMe);
                 var response = Map<User, UserDTO>(user);
-                loginInfo = new {loginInfo.Token, loginDto.Email, Password = "********", LoginSuccessful = true };
+                loginInfo = new { loginDto.Token, loginDto.Email, Password = "********", LoginSuccessful = true };
                 Logger.Info($"Uservalidation: Successful {loginInfo}");
 
                 return Created(response);

Presentation.Web/Controllers/OData/AttachedOptions/AttachedOptionsFunctionController.cs

@@ -39,9 +39,10 @@ public virtual IHttpActionResult GetOptionsByObjectIDAndType(int id, EntityType
         {
             if (UserId == 0)
                 return Unauthorized();
+            var orgId = _authService.GetCurrentOrganizationId(UserId);
 
-            var globalOptionData = _OptionRepository.AsQueryable().Where(s => s.IsEnabled || (s.IsEnabled && s.IsObligatory));
-            var localpersonalData = _LocalOptionRepository.AsQueryable().Where(p => p.IsActive).ToList();
+            var globalOptionData = _OptionRepository.AsQueryable().Where(s => s.IsEnabled);
+            var localpersonalData = _LocalOptionRepository.AsQueryable().Where(p => p.IsActive && p.OrganizationId == orgId).ToList();
 
             List<TOption> result = new List<TOption>();
             result.AddRange(globalOptionData.AsQueryable().Where(s => s.IsObligatory));

Presentation.Web/Presentation.Web.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.props" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.props')" />
   <Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -28,6 +29,11 @@
     <UseGlobalApplicationHostFile>false</UseGlobalApplicationHostFile>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>12.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -785,12 +791,22 @@
     <TypeScriptCompile Include="app\utility\lodash.mixin.ts" />
     <Content Include="app\shared\tinyMCE_lang_da.js" />
     <Content Include="app\shared\typeahead\typeahead.view.html" />
+    <Content Include="Content\css\app.css" />
     <Content Include="Content\css\app.min.css" />
+    <Content Include="Content\css\fonts\tinymce-small.eot" />
     <Content Include="Content\css\fonts\tinymce-small.svg" />
+    <Content Include="Content\css\fonts\tinymce-small.ttf" />
+    <Content Include="Content\css\fonts\tinymce-small.woff" />
+    <Content Include="Content\css\fonts\tinymce.eot" />
     <Content Include="Content\css\fonts\tinymce.svg" />
+    <Content Include="Content\css\fonts\tinymce.ttf" />
+    <Content Include="Content\css\fonts\tinymce.woff" />
+    <Content Include="Content\css\maps\app.min.css.map" />
     <Content Include="Content\css\select2-spinner.gif" />
     <Content Include="Content\css\select2.png" />
     <Content Include="Content\css\select2x2.png" />
+    <Content Include="Content\Default\loading-image.gif" />
+    <Content Include="Content\Default\loading.gif" />
     <Content Include="Content\fonts\fontawesome-webfont.svg" />
     <Content Include="Content\fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Content\img\Accesscontrol.svg" />
@@ -837,15 +853,8 @@
     <Content Include="Content\img\Systemroller.svg" />
     <Content Include="Content\img\VisIOverblik.svg" />
     <Content Include="Content\notify\notify.css" />
-    <Content Include="Content\css\fonts\tinymce-small.eot" />
-    <Content Include="Content\css\fonts\tinymce-small.ttf" />
-    <Content Include="Content\css\fonts\tinymce-small.woff" />
-    <Content Include="Content\css\fonts\tinymce.eot" />
-    <Content Include="Content\css\fonts\tinymce.ttf" />
-    <Content Include="Content\css\fonts\tinymce.woff" />
     <Content Include="app\components\it-system\usage\tabs\it-system-usage-tab-archiving.view.html" />
     <Content Include="app\components\it-project\tabs\it-project-tab-status-project-edit-modal.view.html" />
-    <None Include="Content\kitos.less" />
     <Compile Include="Controllers\OData\ItProjectStatusUpdatesController.cs" />
     <Content Include="externalreferences\SerilogWeb.Classic.dll" />
     <Content Include="favicon.ico" />
@@ -1204,14 +1213,15 @@
     <Content Include="Content\fonts\glyphicons-halflings-regular.woff" />
     <Content Include="Content\fonts\glyphicons-halflings-regular.woff2" />
     <TypeScriptCompile Include="app\models\it-project\it-project-phase.ts" />
-    <Content Include="Content\css\maps\app.min.css.map" />
     <Content Include="app\components\it-project\it-project-modal-create.view.html" />
     <Content Include="app\components\org\user\org-user-delete.modal.view.html" />
     <Content Include="app\components\it-system\edit\tabs\it-system-edit-tab-main.view.html" />
     <Content Include="app\components\it-system\it-interface\it-interface-edit-tab-main.view.html" />
     <Content Include="Content\less\styles.less" />
     <Content Include="Content\less\kitos.less" />
     <Content Include="Content\less\variables.less" />
+    <Content Include="Content\notify\notify.less" />
+    <Content Include="Content\kendo.default.min.css" />
     <None Include="Properties\PublishProfiles\DeployToProd.pubxml" />
     <None Include="Properties\PublishProfiles\DeployToTest.pubxml">
       <SubType>Designer</SubType>
@@ -1434,9 +1444,9 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <TypeScriptModuleKind>commonjs</TypeScriptModuleKind>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
+  <!--<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />-->
   <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
     <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
   </Target>
@@ -1464,5 +1474,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.targets'))" />
   </Target>
+  <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.targets" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.0.6\build\Microsoft.TypeScript.MSBuild.targets')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
 </Project>