andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.1.5.1

Browse Source
This commit is contained in:
andy
2021-08-19 17:25:41 +01:00
parent 6a682ff9ea
commit c2d2d7f674
57 changed files with 3557 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs
+6 -6
View File
@@ -261,7 +261,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
RefreshModel(model);
// Identify item.
SysId articleId = model.ArticleId.ToSysId();
SysId articleId = model.ExtractSysId(model.ArticleId);
if (!SysId.IsValid(articleId))
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"]));
@@ -351,7 +351,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
// Image belongs to the article.
// If the article doesn't yet exist, it will need to be uploaded to the user first and later transferred.
SysId articleId = model.ArticleId.ToSysId();
SysId articleId = model.ExtractSysId(model.ArticleId);
ItemId articleItemId = new ItemId((short)Sax.DataItemType.Article, articleId);
ItemId userItemId = new ItemId((short)Sax.DataItemType.UserAccount, sessionData.User.UserAccountId);
ItemId imageItemId = SysId.IsValid(articleId) ? articleItemId : userItemId;
@@ -467,7 +467,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
}
// Validate item Id against 'Exists' flag.
SysId articleId = model.ArticleId.ToSysId();
SysId articleId = model.ExtractSysId(model.ArticleId);
bool articleExists = StringUtil.ToBool(model.ArticleExists);
if (articleExists && !SysId.IsValid(articleId))
{
@@ -508,9 +508,9 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
// Populate item properties.
if (model.ArticleRegionId != null)
article.RegionIdPrimary = model.ArticleRegionId.ToSysId();
article.RegionIdPrimary = model.ExtractSysId(model.ArticleRegionId);
if (model.ArticleSportId != null)
article.SportIdPrimary = model.ArticleSportId.ToSysId();
article.SportIdPrimary = model.ExtractSysId(model.ArticleSportId);
if (model.ArticleHeadline != null)
article.Headline = model.ArticleHeadline;
if (model.ArticleSummary != null)
@@ -558,7 +558,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
}
else if (!StringUtil.IsEmpty(segmentItemImageId) || !StringUtil.IsEmpty(segmentImageIdx))
{
SysId itemImageId = segmentItemImageId.ToSysId();
SysId itemImageId = model.ExtractSysId(segmentItemImageId);
int imageIdx = StringUtil.ToInt(segmentImageIdx);
// Check for new image first.