diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/joinArray.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/joinArray.filter.js new file mode 100644 index 0000000000..0aa406232c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/filters/joinArray.filter.js @@ -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); + }; +}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index 27b64f85fb..963cc56212 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -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%; diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html index 4215d3e092..18618ce246 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/views/datatype.relations.html @@ -28,7 +28,8 @@
Name
Alias
-
+
Used in
+
Open
@@ -36,7 +37,8 @@
{{relation.name}}
{{relation.alias}}
-
Open
+
{{relation.properties | CMS_joinArray:', ':'name'}}
+
Open
@@ -51,20 +53,22 @@
-
+
Name
Alias
-
+
Used in
+
Open
-
+
{{relation.name}}
{{relation.alias}}
- +
{{relation.properties | CMS_joinArray:', ':'name'}}
+
@@ -84,15 +88,17 @@
Name
Alias
-
+
Used in
+
Open
-
+
{{relation.name}}
{{relation.alias}}
- +
{{relation.properties | CMS_joinArray:', ':'name'}}
+
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index e414c04146..40fd5bfdde 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -1722,6 +1722,7 @@ Mange hilsner fra Umbraco robotten Ingen relationer til Medie Typer. Brugt af Medlems Typer Ingen relationer til Medlems Typer. + Brugt af diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 732586e3af..99a01f1b1d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -2159,6 +2159,7 @@ To manage your website, simply open the Umbraco back office and start adding con No relations to Media Types. Used by Member Types No relations to Member Types. + Used by diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 1f2c1ddb9b..8a2c03b2fc 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2173,5 +2173,6 @@ To manage your website, simply open the Umbraco back office and start adding con No relations to Media Types. Used by Member Types No relations to Member Types. + Used by