Skip to content

Commit 89e55df

Browse files
authored
fix: Improves setting's title (#2864)
1 parent f7a5d1a commit 89e55df

5 files changed

+19
-3
lines changed

src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settingGroup-list.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ angular.module('platformWebApp')
9292
id: 'settingsSection',
9393
data: selectedSettings,
9494
headIcon: node.icon || '',
95-
title: node.name || 'platform.blades.settings-detail.title',
95+
title: node.groupName || 'platform.blades.settings-detail.title',
9696
disableOpenAnimation: disableOpenAnimation,
9797
controller: node.controller || 'platformWebApp.settingsDetailController',
9898
template: node.template || '$(Platform)/Scripts/app/settings/blades/settings-detail.tpl.html',

src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-login-screen-logo.js

+8
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ angular.module('platformWebApp')
5050
function initializeBlade() {
5151
blade.isLoading = true;
5252

53+
// Resolve setting group name
54+
var setting = Array.isArray(blade.data) && blade.data.length > 0 ? blade.data[0] : null;
55+
56+
if (setting && setting.groupName) {
57+
var paths = setting.groupName.split('|');
58+
blade.groupName = paths.pop();
59+
}
60+
5361
settingsApi.getUiCustomizationSetting(function (uiCustomizationSetting) {
5462
blade.isLoading = false;
5563
blade.uiCustomizationSetting = uiCustomizationSetting;

src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-login-screen-logo.tpl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="blade-static __bottom" ng-if="blade.isSavingToParentObject" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel2.tpl.html'"></div>
22
<div class="themeSettingsBlade themeSettingsBlade__blade-content">
33

4-
<legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.title }}</legend>
4+
<legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.groupName }}</legend>
55

66
<div class="themeSettingsBlade themeSettingsBlade__blade-inner">
77
<div class="themeSettingsBlade themeSettingsBlade__inner-block">

src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-logo.js

+8
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@ angular.module('platformWebApp')
8787
function initializeBlade() {
8888
blade.isLoading = true;
8989

90+
// Resolve setting group name
91+
var setting = Array.isArray(blade.data) && blade.data.length > 0 ? blade.data[0] : null;
92+
93+
if (setting && setting.groupName) {
94+
var paths = setting.groupName.split('|');
95+
blade.groupName = paths.pop();
96+
}
97+
9098
settingsApi.getUiCustomizationSetting(function (uiCustomizationSetting) {
9199
blade.isLoading = false;
92100
blade.uiCustomizationSetting = uiCustomizationSetting;

src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-logo.tpl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="blade-static __bottom" ng-if="blade.isSavingToParentObject" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel2.tpl.html'"></div>
22
<div class="themeSettingsBlade themeSettingsBlade__blade-content">
33

4-
<legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.title }}</legend>
4+
<legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.groupName }}</legend>
55

66
<div class="themeSettingsBlade themeSettingsBlade__blade-inner">
77
<div class="themeSettingsBlade themeSettingsBlade__inner-block">

0 commit comments

Comments
 (0)