Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

resolved a number of issues with site creation #224

Browse Source
This commit is contained in:
Shaun Walker
2020-02-25 18:53:36 -05:00
parent 15236d78d4
commit b4ddc45829
17 changed files with 264 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Controllers/AliasController.cs
View File

@ -7,6 +7,7 @@ using Oqtane.Shared;
using Oqtane.Infrastructure;
using System.Linq;
using System;
using System.Net;
namespace Oqtane.Controllers
{
@ -42,6 +43,7 @@ namespace Oqtane.Controllers
[HttpGet("name/{name}")]
public Alias Get(string name)
{
name = WebUtility.UrlDecode(name);
List<Alias> aliases = Aliases.GetAliases().ToList();
Alias alias = null;
alias = aliases.Where(item => item.Name == name).FirstOrDefault();

9
Oqtane.Server/Controllers/SiteController.cs
View File

@ -63,7 +63,7 @@ namespace Oqtane.Controllers
if (authorized)
{
Site = Sites.AddSite(Site);
logger.Log(LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", Site);
logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", Site);
}
}
return Site;
@ -77,7 +77,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
Site = Sites.UpdateSite(Site);
logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site);
logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site);
}
return Site;
}
@ -87,14 +87,15 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)]
public void Delete(int id)
{
Site Site = Sites.GetSite(id);
if (Sites.GetSites().Count() > 1)
{
Sites.DeleteSite(id);
logger.Log(LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
}
else
{
logger.Log(LogLevel.Warning, this, LogFunction.Delete, "Unable to delete the root site.");
logger.Log(Site.SiteId, LogLevel.Warning, this, LogFunction.Delete, "Unable to delete the root site.");
}
}
}

2
Oqtane.Server/Controllers/UserController.cs
View File

@ -160,7 +160,7 @@ namespace Oqtane.Controllers
}
}
user.Password = ""; // remove sensitive information
logger.Log(LogLevel.Information, this, LogFunction.Create, "User Added {User}", user);
logger.Log(User.SiteId, LogLevel.Information, this, LogFunction.Create, "User Added {User}", user);
}
return user;