3.0.0.5 Portal Security, Commodity, Code Types, Codes.
This commit is contained in:
+4
-4
@@ -72,8 +72,8 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Account
|
||||
// User list.
|
||||
public List<UserListData> Users { get; } = new List<UserListData>();
|
||||
// Reference data.
|
||||
public List<CodeDesc> Statuses { get; } = new List<CodeDesc>();
|
||||
public List<CodeDesc> StatusesCreate { get; } = new List<CodeDesc>();
|
||||
public List<ItemCodeDesc> Statuses { get; } = new List<ItemCodeDesc>();
|
||||
public List<ItemCodeDesc> StatusesCreate { get; } = new List<ItemCodeDesc>();
|
||||
public String StatusCodeDefault { get; set; }
|
||||
}
|
||||
//-------------------------------------------------------------------
|
||||
@@ -94,9 +94,9 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Account
|
||||
// Reference data - statuses.
|
||||
foreach (SaStatus status in SbmcUserAccount.ValidStatuses)
|
||||
{
|
||||
responseData.Statuses.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
if (status != SaStatus.Deleted)
|
||||
responseData.StatusesCreate.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.StatusesCreate.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
}
|
||||
responseData.StatusCodeDefault = SacsSystem.GetStatusCode(SbmcUserAccount.DefaultStatus);
|
||||
|
||||
|
||||
@@ -59,8 +59,8 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
|
||||
// Owner list.
|
||||
public List<OwnerListData> Owners { get; } = new List<OwnerListData>();
|
||||
// Reference data.
|
||||
public List<CodeDesc> Statuses { get; } = new List<CodeDesc>();
|
||||
public List<CodeDesc> StatusesCreate { get; } = new List<CodeDesc>();
|
||||
public List<ItemCodeDesc> Statuses { get; } = new List<ItemCodeDesc>();
|
||||
public List<ItemCodeDesc> StatusesCreate { get; } = new List<ItemCodeDesc>();
|
||||
public String StatusCodeDefault { get; set; }
|
||||
}
|
||||
//-------------------------------------------------------------------
|
||||
@@ -81,9 +81,9 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
|
||||
// Reference data - statuses.
|
||||
foreach (SaStatus status in SbmcOwner.ValidStatuses)
|
||||
{
|
||||
responseData.Statuses.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
if (status != SaStatus.Deleted)
|
||||
responseData.StatusesCreate.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.StatusesCreate.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
}
|
||||
responseData.StatusCodeDefault = SacsSystem.GetStatusCode(SbmcOwner.DefaultStatus);
|
||||
|
||||
|
||||
+4
-4
@@ -61,8 +61,8 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
|
||||
// Repository list.
|
||||
public List<RepositoryListData> Repositories { get; } = new List<RepositoryListData>();
|
||||
// Reference data.
|
||||
public List<CodeDesc> Statuses { get; } = new List<CodeDesc>();
|
||||
public List<CodeDesc> StatusesCreate { get; } = new List<CodeDesc>();
|
||||
public List<ItemCodeDesc> Statuses { get; } = new List<ItemCodeDesc>();
|
||||
public List<ItemCodeDesc> StatusesCreate { get; } = new List<ItemCodeDesc>();
|
||||
public String StatusCodeDefault { get; set; }
|
||||
}
|
||||
//-------------------------------------------------------------------
|
||||
@@ -83,9 +83,9 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
|
||||
// Reference data - statuses.
|
||||
foreach (SaStatus status in SbmcRepository.ValidStatuses)
|
||||
{
|
||||
responseData.Statuses.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
if (status != SaStatus.Deleted)
|
||||
responseData.StatusesCreate.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.StatusesCreate.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
}
|
||||
responseData.StatusCodeDefault = SacsSystem.GetStatusCode(SbmcRepository.DefaultStatus);
|
||||
|
||||
|
||||
@@ -167,8 +167,8 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Param
|
||||
// Items.
|
||||
public List<ParamListData> Params { get; } = new List<ParamListData>();
|
||||
// Reference data.
|
||||
public List<CodeDesc> Statuses { get; } = new List<CodeDesc>();
|
||||
public List<CodeDesc> StatusesCreate { get; } = new List<CodeDesc>();
|
||||
public List<ItemCodeDesc> Statuses { get; } = new List<ItemCodeDesc>();
|
||||
public List<ItemCodeDesc> StatusesCreate { get; } = new List<ItemCodeDesc>();
|
||||
public String StatusCodeDefault { get; set; }
|
||||
}
|
||||
//-------------------------------------------------------------------
|
||||
@@ -189,9 +189,9 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Param
|
||||
// Reference data - statuses.
|
||||
foreach (SaStatus status in SbmcItemParam.ValidStatuses)
|
||||
{
|
||||
responseData.Statuses.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
if (status != SaStatus.Deleted)
|
||||
responseData.StatusesCreate.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status));
|
||||
responseData.StatusesCreate.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
|
||||
}
|
||||
responseData.StatusCodeDefault = SacsSystem.GetStatusCode(SbmcItemParam.DefaultStatus);
|
||||
|
||||
|
||||
@@ -227,7 +227,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers
|
||||
public ActionResult Ajax_StorePassword(Model_Security model)
|
||||
{
|
||||
AjaxResponse_ChangePassword responseData = new AjaxResponse_ChangePassword(model);
|
||||
String messageTitle = Localiser["security.caption.change.password"];
|
||||
String messageTitle = Localiser["caption.change.password"];
|
||||
|
||||
// Record disposable items as they are created so all can be disposed when needed.
|
||||
using (DisposableCollection<SacsHierarchyItem> disposables = new DisposableCollection<SacsHierarchyItem>())
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="">
|
||||
<div class="sbc-panel-form security">
|
||||
|
||||
<div class="sbc-header"><div class="sbc-caption">@Localiser["security.caption.change.password"]</div></div>
|
||||
<div class="sbc-header"><div class="sbc-caption">@Localiser["caption.change.password"]</div></div>
|
||||
|
||||
<div class="sbc-content">
|
||||
<div class="spacer4"></div>
|
||||
@@ -57,7 +57,7 @@
|
||||
<div class="spacer4"></div>
|
||||
|
||||
<div class="">
|
||||
<div id="pbChangePassword" class="sbc-button-action fullwidth pointer" style="margin:16px 0;">@Localiser["security.caption.change.password"]</div>
|
||||
<div id="pbChangePassword" class="sbc-button-action fullwidth pointer" style="margin:16px 0;">@Localiser["caption.change.password"]</div>
|
||||
</div>
|
||||
|
||||
}
|
||||
|
||||
@@ -33,13 +33,12 @@
|
||||
}
|
||||
ch.handleDbSchemaResponse = function (response)
|
||||
{
|
||||
sbc.debug('handleDbSchemaResponse', response);
|
||||
//sbc.debug('handleDbSchemaResponse', response);
|
||||
delete ch.awaitingSchemaResponse;
|
||||
let $pnlSchema = $('.sbc-panel-results .sbc-panel-info.DbSchema.' + response.instance);
|
||||
var $msgs = $('.sbc-panel-messages', $pnlSchema).hide().empty();
|
||||
var $tablePanel = $('.sbc-panel-item-table', $pnlSchema).hide();
|
||||
var $table = $('table.sbc-item-list', $tablePanel);
|
||||
sbc.debug($table);
|
||||
$('tbody tr', $table).remove();
|
||||
if (!response.success) return;
|
||||
if (response.instance == 'Control') ch.toSchema = setTimeout(function () { ch.refreshDbSchema('Template'); }, 250);
|
||||
|
||||
@@ -172,8 +172,6 @@
|
||||
$('table tbody', $pnl.table).prepend($item).show();
|
||||
}
|
||||
io.populateItem($item, item);
|
||||
// Force repopulation of sprts.
|
||||
delete io.data.owners;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------
|
||||
|
||||
@@ -37,8 +37,6 @@
|
||||
env.$pnl.bgr.invisible();
|
||||
env.$pnl.mnu.empty();
|
||||
env.$pnl.mnu.append(cd.getFilterMenuOption(env, sbc.lbl.refresh, function () { cd.refreshItems(env); }, 'sbc-refresh'));
|
||||
env.$pnl.mnu.append(cd.getFilterMenuOption(env, sbc.lbl.popIndices, function () { cd.populateIndices(env); }, 'sbc-config'));
|
||||
sbc.debug(!!$('.sbc-dropdown-item', env.$pnl.mnu).length);
|
||||
env.$pnl.bgr.toggleVisibility(!!$('.sbc-dropdown-item', env.$pnl.mnu).length);
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
}
|
||||
ir.onInitQuery = function (env, response)
|
||||
{
|
||||
sbc.debug('onInitQuery', response);
|
||||
//sbc.debug('onInitQuery', response);
|
||||
if (!response.success) return;
|
||||
|
||||
let $ctrls = env.$frm.init.find('.sbc-input,.sbc-textarea,.sbc-select').val('');
|
||||
@@ -71,7 +71,7 @@
|
||||
}
|
||||
ir.onInitRepo = function (env, response)
|
||||
{
|
||||
sbc.debug('onInitRepo', env, response);
|
||||
//sbc.debug('onInitRepo', env, response);
|
||||
sbc.refreshControlValues(response.controlValues);
|
||||
if (!response.success) return;
|
||||
env.$dlg.init.dialog('close');
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
env.$pnl.mnu.empty();
|
||||
env.$pnl.mnu.append(rs.getFilterMenuOption(env, sbc.lbl.refresh, function () { rs.refreshDbSchema(env); }, 'sbc-refresh'));
|
||||
env.$pnl.mnu.append(rs.getFilterMenuOption(env, sbc.lbl.popIndices, function () { rs.populateIndices(env); }, 'sbc-process'));
|
||||
sbc.debug(env.$pnl.mnu);
|
||||
env.$pnl.bgr.toggleVisibility(!!env.$pnl.mnu.find('.sbc-dropdown-item').length);
|
||||
}
|
||||
// Items.
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
}
|
||||
ir.onInitRepo = function (id)
|
||||
{
|
||||
sbc.debug('onInitRepo', id);
|
||||
//sbc.debug('onInitRepo', id);
|
||||
ir.refreshResults(50);
|
||||
}
|
||||
|
||||
|
||||
@@ -194,8 +194,6 @@
|
||||
$('table tbody', $pnl.table).prepend($item).show();
|
||||
}
|
||||
ip.populateItem($item, item);
|
||||
// Force repopulation of sprts.
|
||||
delete ip.data.params;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
}
|
||||
sl.doRefreshFolders = function (response)
|
||||
{
|
||||
sbc.debug('doRefreshFolders', response);
|
||||
//sbc.debug('doRefreshFolders', response);
|
||||
delete sl.data.awaitingRefreshFoldersResponse;
|
||||
sl.clearFilterFolders();
|
||||
sbc.refreshControlValues(response.controlValues);
|
||||
|
||||
@@ -176,8 +176,6 @@
|
||||
$('table tbody', $pnl.table).prepend($item).show();
|
||||
}
|
||||
ua.populateItem($item, item);
|
||||
// Force repopulation of sprts.
|
||||
delete ua.data.users;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user