summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-05-31 13:49:02 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-05-31 13:49:02 +0300
commitb5edf82b9529be45fcf448d4a8b27452580d60ef (patch)
tree75b1d8ba16f1ad4c7e2a8b128321af1f9a9c9f33
parentb319c68d6b0aa3422f0dddfa721249bfbdfd6bac (diff)
downloadaconf-b5edf82b9529be45fcf448d4a8b27452580d60ef.tar.bz2
aconf-b5edf82b9529be45fcf448d4a8b27452580d60ef.tar.xz
propagate ui_member parameter correctly to Collection instances
-rw-r--r--acf/model/init.lua6
-rw-r--r--protocol.txt2
2 files changed, 6 insertions, 2 deletions
diff --git a/acf/model/init.lua b/acf/model/init.lua
index 9b061ef..7b58190 100644
--- a/acf/model/init.lua
+++ b/acf/model/init.lua
@@ -128,7 +128,11 @@ function Collection:init(params, itype)
assert(self.type)
self.itype = itype or node.Collection
- self.iparams = {required=self.required, destroy=self.destroy}
+ self.iparams = {
+ destroy=self.destroy,
+ required=self.required,
+ ui_member=self.ui_member
+ }
self.dtype = 'collection'
self.widget = self.dtype
diff --git a/protocol.txt b/protocol.txt
index f94e9e3..9a09511 100644
--- a/protocol.txt
+++ b/protocol.txt
@@ -58,7 +58,7 @@ resp: JSON object, with the following attributes:
objects
- members (collections and sets only): metadata for
members (JSON object)
- - ui-members (collections and sets only): singular noun
+ - ui-member (collections and sets only): singular noun
describing members (shown to user)
- scope (references only): subtree where the reference can
refer to