yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added used by properties

Browse Source
This commit is contained in:
Niels Lyngsø
2019-10-09 11:37:45 +02:00
parent 4c344fcb9e
commit dd29fe5745
6 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI.Client/src/common/filters/joinArray.filter.js Normal file
View File

@@ -0,0 +1,20 @@
/**
* @ngdoc filter
* @name umbraco.filters.filter:CMS_joinArray
* @namespace CMS_joinArrayFilter
*
* param {array} array of string or objects, if an object use the third argument to specify which prop to list.
* param {seperator} string containing the seperator to add between joined values.
* param {prop} string used if joining an array of objects, set the name of properties to join.
*
* @description
* Join an array of string or an array of objects, with a costum seperator.
*
*/
angular.module("umbraco.filters").filter('CMS_joinArray', function () {
return function join(array, separator, prop) {
return (!angular.isUndefined(prop) ? array.map(function (item) {
return item[prop];
}) : array).join(separator);
};
});

3
src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
View File

@@ -264,6 +264,9 @@ input.umb-table__input {
flex: 0 0 auto !important;
}
.umb-table-cell--nano {
flex: 0 0 50px;
}
.umb-table-cell--small {
flex: .5 .5 1%;
max-width: 12.5%;

24
src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html
View File

@@ -28,7 +28,8 @@
<div class="umb-table-cell"></div>
<div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
<div class="umb-table-cell"><localize key="content_alias">Alias</localize></div>
<div class="umb-table-cell umb-table-cell--auto-width"></div>
<div class="umb-table-cell umb-table-cell--large"><localize key="relation_usedByProperties">Used in</localize></div>
<div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
</div>
</div>
<div class="umb-table-body">
@@ -36,7 +37,8 @@
<div class="umb-table-cell"><i class="umb-table-body__icon {{relation.icon}}"></i></div>
<div class="umb-table-cell umb-table__name">{{relation.name}}</div>
<div class="umb-table-cell">{{relation.alias}}</div>
<div class="umb-table-cell umb-table-cell--auto-width"><a href="#/settings/documentTypes/edit/{{relation.id}}"><localize key="general_open">Open</localize></a></div>
<div class="umb-table-cell umb-table-cell--large">{{relation.properties | CMS_joinArray:', ':'name'}}</div>
<div class="umb-table-cell umb-table-cell--nano"><a href="#/settings/documentTypes/edit/{{relation.id}}"><localize key="general_open">Open</localize></a></div>
</div>
</div>
</div>
@@ -51,20 +53,22 @@
</h5>
<div class="umb-table">
<div class="umb-table-head" ng-if="vm.relations.mediaTypes.length > 0">
<div class="umb-table-head">
<div class="umb-table-row">
<div class="umb-table-cell"></div>
<div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
<div class="umb-table-cell"><localize key="content_alias">Alias</localize></div>
<div class="umb-table-cell umb-table-cell--auto-width"></div>
<div class="umb-table-cell umb-table-cell--large"><localize key="relation_usedByProperties">Used in</localize></div>
<div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
</div>
</div>
<div class="umb-table-body">
<div class="umb-table-row" ng-repeat="relation in vm.relations.mediaTypes">
<div class="umb-table-row" ng-repeat="relation in vm.relations.documentTypes">
<div class="umb-table-cell"><i class="umb-table-body__icon {{relation.icon}}"></i></div>
<div class="umb-table-cell umb-table__name">{{relation.name}}</div>
<div class="umb-table-cell">{{relation.alias}}</div>
<div class="umb-table-cell umb-table-cell--auto-width"><a href="#/settings/mediaTypes/edit/{{relation.id}}"><localize key="general_open">Open</localize></a></div>
<div class="umb-table-cell umb-table-cell--large">{{relation.properties | CMS_joinArray:', ':'name'}}</div>
<div class="umb-table-cell umb-table-cell--nano"><a href="#/settings/documentTypes/edit/{{relation.id}}"><localize key="general_open">Open</localize></a></div>
</div>
</div>
</div>
@@ -84,15 +88,17 @@
<div class="umb-table-cell"></div>
<div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
<div class="umb-table-cell"><localize key="content_alias">Alias</localize></div>
<div class="umb-table-cell umb-table-cell--auto-width"></div>
<div class="umb-table-cell umb-table-cell--large"><localize key="relation_usedByProperties">Used in</localize></div>
<div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
</div>
</div>
<div class="umb-table-body">
<div class="umb-table-row" ng-repeat="relation in vm.relations.memberTypes">
<div class="umb-table-row" ng-repeat="relation in vm.relations.documentTypes">
<div class="umb-table-cell"><i class="umb-table-body__icon {{relation.icon}}"></i></div>
<div class="umb-table-cell umb-table__name">{{relation.name}}</div>
<div class="umb-table-cell">{{relation.alias}}</div>
<div class="umb-table-cell umb-table-cell--auto-width"><a href="#/settings/memberTypes/edit/{{relation.id}}"><localize key="general_open">Open</localize></a></div>
<div class="umb-table-cell umb-table-cell--large">{{relation.properties | CMS_joinArray:', ':'name'}}</div>
<div class="umb-table-cell umb-table-cell--nano"><a href="#/settings/documentTypes/edit/{{relation.id}}"><localize key="general_open">Open</localize></a></div>
</div>
</div>
</div>

1
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -1722,6 +1722,7 @@ Mange hilsner fra Umbraco robotten
<key alias="noMediaTypes">Ingen relationer til Medie Typer.</key>
<key alias="labelUsedByMemberTypes">Brugt af Medlems Typer</key>
<key alias="noMemberTypes">Ingen relationer til Medlems Typer.</key>
<key alias="usedByProperties">Brugt af</key>
</area>
</language>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -2159,6 +2159,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noMediaTypes">No relations to Media Types.</key>
<key alias="labelUsedByMemberTypes">Used by Member Types</key>
<key alias="noMemberTypes">No relations to Member Types.</key>
<key alias="usedByProperties">Used by</key>
</area>
</language>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -2173,5 +2173,6 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noMediaTypes">No relations to Media Types.</key>
<key alias="labelUsedByMemberTypes">Used by Member Types</key>
<key alias="noMemberTypes">No relations to Member Types.</key>
<key alias="usedByProperties">Used by</key>
</area>
</language>