fix default status

mixcore · Sep 29, 2020 · 1f32506 · 1f32506
1 parent 23478a3
commit 1f32506
Show file tree

Hide file tree

Showing 13 changed files with 3,826 additions and 3,794 deletions.
diff --git a/src/Mix.Cms.Lib/Controllers/BaseRestWithCrudApiController.cs b/src/Mix.Cms.Lib/Controllers/BaseRestWithCrudApiController.cs
@@ -79,7 +79,7 @@ public async Task<ActionResult<TView>> Get(string id)
             }
             else
             {
-                return NotFound();
+                return NoContent();
             }
         }
 

diff --git a/src/Mix.Cms.Lib/ViewModels/MixAttributeSetDataValues/UpdateViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixAttributeSetDataValues/UpdateViewModel.cs
@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Mix.Cms.Lib.Models.Cms;
+using Mix.Cms.Lib.Services;
 using Mix.Domain.Data.ViewModels;
 using Newtonsoft.Json;
 using System;
@@ -151,6 +152,11 @@ private void ParseDefaultValue(string defaultValue)
 
         public override void ExpandView(MixCmsContext _context = null, IDbContextTransaction _transaction = null)
         {
+            if (string.IsNullOrEmpty(Id))
+            {
+                Status = Status == default ? Enum.Parse<MixEnums.MixContentStatus>(MixService.GetConfig<string>(MixConstants.ConfigurationKeyword.DefaultContentStatus)) : Status;
+            }
+
             if (AttributeFieldId > 0)
             {
                 Field = MixAttributeFields.UpdateViewModel.Repository.GetSingleModel(f => f.Id == AttributeFieldId).Data;

diff --git a/src/Mix.Cms.Lib/ViewModels/MixAttributeSetDatas/UpdateViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixAttributeSetDatas/UpdateViewModel.cs
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using Mix.Cms.Lib.Models.Cms;
+using Mix.Cms.Lib.Services;
 using Mix.Common.Helper;
 using Mix.Domain.Core.ViewModels;
 using Mix.Domain.Data.ViewModels;
@@ -86,6 +87,10 @@ public UpdateViewModel(MixAttributeSetData model, MixCmsContext _context = null,
 
         public override void ExpandView(MixCmsContext _context = null, IDbContextTransaction _transaction = null)
         {
+            if (string.IsNullOrEmpty(Id))
+            {
+                Status = Status == default ? Enum.Parse<MixEnums.MixContentStatus>(MixService.GetConfig<string>(MixConstants.ConfigurationKeyword.DefaultContentStatus)) : Status;
+            }
             // Related Datas
             DataNavs = MixRelatedAttributeDatas.UpdateViewModel.Repository.GetModelListBy(
                 n => n.ParentId == Id && n.ParentType == MixEnums.MixAttributeSetDataType.Set.ToString() && n.Specificulture == Specificulture,

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPosts/UpdateViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPosts/UpdateViewModel.cs
@@ -1135,7 +1135,7 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
                             ParentType = MixEnums.MixAttributeSetDataType.Post.ToString(),
                             ParentId = Id.ToString(),
                             AttributeSetId = Attributes.Id,
-                            AttributeSetName = Attributes.Name
+                            AttributeSetName = Attributes.Name                            
                         }
                         )
                     {

diff --git a/src/Mix.Cms.Lib/ViewModels/MixRelatedAttributeDatas/UpdateViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixRelatedAttributeDatas/UpdateViewModel.cs
@@ -82,14 +82,18 @@ public override MixRelatedAttributeData ParseModel(MixCmsContext _context = null
             if (string.IsNullOrEmpty(Id))
             {
                 Id = Guid.NewGuid().ToString();
-                CreatedDateTime = DateTime.UtcNow;
-                Status = Status == default ? Enum.Parse<MixEnums.MixContentStatus>(MixService.GetConfig<string>(MixConstants.ConfigurationKeyword.DefaultContentStatus)) : Status;
+                CreatedDateTime = DateTime.UtcNow;                
             }
             return base.ParseModel(_context, _transaction);
         }
 
         public override void ExpandView(MixCmsContext _context = null, IDbContextTransaction _transaction = null)
         {
+            if (string.IsNullOrEmpty(Id))
+            {
+                Status = Status == default ? Enum.Parse<MixEnums.MixContentStatus>(MixService.GetConfig<string>(MixConstants.ConfigurationKeyword.DefaultContentStatus)) : Status;
+            }
+
             var getData = MixAttributeSetDatas.UpdateViewModel.Repository.GetSingleModel(p => p.Id == DataId && p.Specificulture == Specificulture
                 , _context: _context, _transaction: _transaction
             );

diff --git a/src/Mix.Cms.Web/Views/Portal/Index.cshtml b/src/Mix.Cms.Web/Views/Portal/Index.cshtml
@@ -9,13 +9,14 @@
 
     <mix-loader ng-show="isBusy"></mix-loader>
     <header-nav ng-if="isInit" settings="settings" bread-crumbs="breadCrumbs"></header-nav>
+    <login-popup></login-popup>
     <div class="container-fluid wrapper">
         <div class="row flex-xl-nowrap">
             <main-side-bar ng-if="isAdmin"></main-side-bar>
             <main-side-bar-dynamic ng-if="!isAdmin" roles="roles" actived-role="roles[0]"></main-side-bar-dynamic>
             <!-- <main class="py-md-4 px-md-2 sw-content" role="main"> -->
             <main class="pb-md-5 px-md-5 sw-content w-100" role="main" style="background-color: var(--bg-color,hsla(var(--primary-color-hue,211),var(--primary-color-saturation,100%),100%,1));">
-                
+
                 <footer class="footer d-block fixed-bottom pt-2 pr-5 text-black-50" style="z-index:0;">
                     <div class="container-fluid">
                         <nav>

diff --git a/src/Mix.Cms.Web/wwwroot/app/app-portal/components/actions/actions.html b/src/Mix.Cms.Web/wwwroot/app/app-portal/components/actions/actions.html
@@ -1 +1 @@
-<div class="position-sticky" style="top: 5.5rem; z-index: 20;"><div class="card mb-4"><div class="card-body"><div class="btn-group w-100"><a ng-click="$ctrl.back()" class="btn btn-outline-primary text-primary"><i class="fa fa-chevron-left"></i> <span ng-bind="$ctrl.translate('Back')"></span> </a><a ng-if="$ctrl.previewUrl" target="_blank" href="{{$ctrl.previewUrl}}" class="btn btn-outline-primary"><i class="fas fa-eye"></i> <span ng-bind="$ctrl.translate('Preview')"></span> </a><a ng-if="$ctrl.contentUrl" href="{{$ctrl.contentUrl}}" class="btn btn-outline-primary"><i class="fa fa-align-justify"></i> <span ng-bind="$ctrl.translate('Data')"></span> </a><button id="btnToSubmit" type="submit" class="btn btn-outline-primary"><i class="fa fa-save"></i> <span ng-bind="$ctrl.translate('Save')"></span></button> <button type="button" ng-click="$ctrl.clearCache()" class="btn btn-outline-primary"><i class="fa fa-refresh"></i> <span ng-bind="$ctrl.translate('Clear Cache')"></span></button></div></div></div></div>
+<div class="position-sticky" style="top: 5.5rem; z-index: 20;"><div class="card mb-4"><div class="card-body"><div class="btn-group w-100"><a ng-click="$ctrl.back()" class="btn btn-outline-primary text-primary"><i class="fa fa-chevron-left"></i> <span ng-bind="$ctrl.translate('Back')"></span> </a><a ng-if="$ctrl.previewUrl" target="_blank" href="{{$ctrl.previewUrl}}" class="btn btn-outline-primary"><i class="fas fa-eye"></i> <span ng-bind="$ctrl.translate('Preview')"></span> </a><a ng-if="$ctrl.contentUrl" href="{{$ctrl.contentUrl}}" class="btn btn-outline-primary"><i class="fa fa-align-justify"></i> <span ng-bind="$ctrl.translate('Data')"></span> </a><button id="btnToSubmit" type="submit" class="btn btn-outline-primary"><i class="fa fa-save"></i> <span ng-bind="$ctrl.translate('Save')"></span></button> <button type="button" ng-click="$ctrl.isAdmin && $ctrl.onClearCache()" class="btn btn-outline-primary"><i class="fa fa-refresh"></i> <span ng-bind="$ctrl.translate('Clear Cache')"></span></button></div></div></div></div>
diff --git a/src/Mix.Cms.Web/wwwroot/app/app-portal/pages/module/details.html b/src/Mix.Cms.Web/wwwroot/app/app-portal/pages/module/details.html
@@ -1 +1 @@
-<section ng-init="getSingle()"><form class="row" ng-class="{'submitted': submitted}" ng-submit="save()"><section class="col-sm-8 pr-3"><tabs-v class="mb-3"><pane-v header="Standard"><module-content model="activedData"></module-content></pane-v><pane-v header="Advanced"><module-advanced model="activedData"></module-advanced></pane-v></tabs-v></section><section class="col-sm-4 pl-3"><actions clear-cache="clearCache()" preview-url="activedData.detailsUrl" back-url="'/portal/module/list'"></actions><cultures is-clone="activedData.isClone" data="activedData.cultures"></cultures><div class="card mb-4"><h6 class="card-header position-sticky position-sticky-under-actionbar">Info</h6><div class="card-body"><statuses status="activedData.status"></statuses><div class="form-group" ng-if="activedData.status == 4"><label class="control-label">Published Date Time</label><div class="input-group input-group-sm"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Calendar"></i></span></div><input value="{{activedData.publishedDateTime}}" ng-model="activedData.publishedDateTime" type="datetime-local" class="form-control"></div></div><div class="form-group"><label class="control-label">Created Date Time</label><div class="input-group"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Calendar"></i></span></div><input ng-model="activedData.createdDateTime" type="text" class="form-control" readonly="readonly"></div></div><div class="form-group mb-0"><label class="control-label">Author</label><div class="input-group"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Contact"></i></span></div><input ng-model="activedData.createdBy" class="form-control" readonly="readonly"></div></div><div class="form-group mb-0"><label class="control-label">Template</label><div class="input-group"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Layout"></i></span></div><select class="custom-select" ng-options="item as item.fileName for item in activedData.templates track by item.id" ng-model="activedData.view"></select></div></div></div></div><modal-nav-metas ng-if="activedData.sysCategories" header="'Categories'" parent-id="activedData.id" parent-type="'4'" type="''" attribute-set-name="'sys_category'" field-display="'title'" selected-list="activedData.sysCategories"></modal-nav-metas><modal-nav-metas ng-if="activedData.sysTags" header="'Tags'" parent-id="activedData.id" parent-type="'4'" type="''" attribute-set-name="'sys_tag'" field-display="'title'" selected-list="activedData.sysTags"></modal-nav-metas><tabs-v ng-if="activedData" select-callback="selectPane(pane)" class="mb-4"><pane-v header="Feature Img"><custom-image header="'Feature upload'" type="'Modules'" folder="activedData.seoName" src-url="activedData.image" title="activedData.title" description="activedData.description" src="activedData.image" auto="'true'"></custom-image></pane-v><pane-v header="Thumbnail Img"><custom-image header="'Thumnail upload'" type="'Modules'" folder="activedData.seoName" title="activedData.title" description="activedData.description" src-url="activedData.thumbnail" src="activedData.thumbnail" auto="'true'"></custom-image></pane-v></tabs-v></section></form></section>
+<section ng-init="getSingle()"><form class="row" ng-class="{'submitted': submitted}" ng-submit="save()"><section class="col-sm-8 pr-3"><tabs-v class="mb-3"><pane-v header="Standard"><module-content model="activedData"></module-content></pane-v><pane-v header="Advanced"><module-advanced model="activedData"></module-advanced></pane-v></tabs-v></section><section class="col-sm-4 pl-3"><actions on-clear-cache="clearCache()" preview-url="activedData.detailsUrl" back-url="'/portal/module/list'"></actions><cultures is-clone="activedData.isClone" data="activedData.cultures"></cultures><div class="card mb-4"><h6 class="card-header position-sticky position-sticky-under-actionbar">Info</h6><div class="card-body"><statuses status="activedData.status"></statuses><div class="form-group" ng-if="activedData.status == 4"><label class="control-label">Published Date Time</label><div class="input-group input-group-sm"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Calendar"></i></span></div><input value="{{activedData.publishedDateTime}}" ng-model="activedData.publishedDateTime" type="datetime-local" class="form-control"></div></div><div class="form-group"><label class="control-label">Created Date Time</label><div class="input-group"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Calendar"></i></span></div><input ng-model="activedData.createdDateTime" type="text" class="form-control" readonly="readonly"></div></div><div class="form-group mb-0"><label class="control-label">Author</label><div class="input-group"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Contact"></i></span></div><input ng-model="activedData.createdBy" class="form-control" readonly="readonly"></div></div><div class="form-group mb-0"><label class="control-label">Template</label><div class="input-group"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="mi mi-Layout"></i></span></div><select class="custom-select" ng-options="item as item.fileName for item in activedData.templates track by item.id" ng-model="activedData.view"></select></div></div></div></div><modal-nav-metas ng-if="activedData.sysCategories" header="'Categories'" parent-id="activedData.id" parent-type="'4'" type="''" attribute-set-name="'sys_category'" field-display="'title'" selected-list="activedData.sysCategories"></modal-nav-metas><modal-nav-metas ng-if="activedData.sysTags" header="'Tags'" parent-id="activedData.id" parent-type="'4'" type="''" attribute-set-name="'sys_tag'" field-display="'title'" selected-list="activedData.sysTags"></modal-nav-metas><tabs-v ng-if="activedData" select-callback="selectPane(pane)" class="mb-4"><pane-v header="Feature Img"><custom-image header="'Feature upload'" type="'Modules'" folder="activedData.seoName" src-url="activedData.image" title="activedData.title" description="activedData.description" src="activedData.image" auto="'true'"></custom-image></pane-v><pane-v header="Thumbnail Img"><custom-image header="'Thumnail upload'" type="'Modules'" folder="activedData.seoName" title="activedData.title" description="activedData.description" src-url="activedData.thumbnail" src="activedData.thumbnail" auto="'true'"></custom-image></pane-v></tabs-v></section></form></section>