Skip to content

Commit

Permalink
Merge pull request OpenCodeFoundation#2 from techcombd/bugfix/absolut…
Browse files Browse the repository at this point in the history
…e-path-fix

fix absolute path reference
  • Loading branch information
aftabkajal authored Apr 13, 2018
2 parents 5b55ca5 + 3216f47 commit 2814d50
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 28 deletions.
4 changes: 1 addition & 3 deletions src/AssetManager.Core/AssetManager.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
</PropertyGroup>

<ItemGroup>
<Reference Include="System.ComponentModel.Annotations">
<HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\ref\netcoreapp2.0\System.ComponentModel.Annotations.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.0.3" />
</ItemGroup>

</Project>
30 changes: 6 additions & 24 deletions src/AssetManager.Core/Entities/Category.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,28 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace AssetManager.Core.Entities
{
public class Category: Entity
public class Category : Entity
{


[Required]
[Display(Name =("Catagory Name"))]
[Display(Name = ("Catagory Name"))]
public string Name { get; set; }


// [ForeignKey("UserId")]
// public int UserId { get; set; }
//public virtual User User { get; set; }



[Display(Name =("EULA"))]
[Display(Name = ("EULA"))]
public string EulaText { get; set; }

[Display(Name =("Use the primary default EULA instead. "))]
[Display(Name = ("Use the primary default EULA instead. "))]
public bool DefaultEula { get; set; }

//[Display(Name =("Require users to confirm acceptance of assets in this category."))]
//public bool Acceptance { get; set; }

/// <summary>
/// Need to check, how to get class Name
/// </summary>
public string CategoryType { get; set; }

[Display(Name =("Send email to user on checkin."))]
[Display(Name = ("Send email to user on checkin."))]
public bool CheckInEmail { get; set; }

[Display(Name =("Image"))]
[Display(Name = ("Image"))]
public string Image { get; set; }

public DateTime CreatedAt { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/AssetManager.Web/Controllers/CompaniesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace AssetManager.Web.Controllers
{
public class CompaniesController : Controller
{
private IAsyncRepository<Company> _companyRepository;
private readonly IAsyncRepository<Company> _companyRepository;

public CompaniesController(IAsyncRepository<Company> repository)
{
Expand Down

0 comments on commit 2814d50

Please sign in to comment.