diff options
| -rw-r--r-- | web/node.js | 6 | ||||
| -rw-r--r-- | web/widget/link.html | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/web/node.js b/web/node.js index 22e4a38..0ff9577 100644 --- a/web/node.js +++ b/web/node.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 Kaarle Ritvanen + * Copyright (c) 2012-2016 Kaarle Ritvanen * See LICENSE file for license details */ @@ -150,7 +150,7 @@ angular.module("aconf").directive("aconfFields", function() { } } }; -}).directive("aconfModelFields", function(aconfType) { +}).directive("aconfModelFields", function() { return { restrict: "C", require: "?aconfField", @@ -161,7 +161,7 @@ angular.module("aconf").directive("aconfFields", function() { scope.fields = _.where(node.meta.fields, {visible: true}); scope.columns = _.filter(scope.fields, function(field) { - return !(field.condition || aconfType.isCollection(field)); + return !(field.detail || field.condition); }); scope.$emit("columns", _.pluck(scope.columns, "ui-name")); diff --git a/web/widget/link.html b/web/widget/link.html index 750f76a..a9733ac 100644 --- a/web/widget/link.html +++ b/web/widget/link.html @@ -1,8 +1,8 @@ <!-- - Copyright (c) 2012-2015 Kaarle Ritvanen + Copyright (c) 2012-2016 Kaarle Ritvanen See LICENSE file for license details --> -<aconf-link path="value" label="{{ field.label }}" status="status"> +<aconf-link path="value" label="{{ field.label || 'Show' }}" status="status"> </aconf-link> <aconf-del-button></aconf-del-button> |