Changeset 1155

Timestamp:

2008-09-16 10:47:44 (4 months ago)

Author:

gaspard

Message:

Fixed a bug where forms to create new nodes could not display checkboxes/radio/selects for relations because the class totally defined yet.
This happens when the 'klass' parameter is defined by the user.

Files:

• trunk/app/models/relation_proxy.rb (modified) (1 diff)
• trunk/lib/parser/test/parser/zafu.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)
• trunk/test/unit/relation_proxy_test.rb (modified) (1 diff)

trunk/app/models/relation_proxy.rb

@@ -20 +20 @@
-    def get_proxy(node, role)
-      rel = find_by_role(role)
-node.vclass.kpath =~ /\A#{rel.this_kpath}/
+(node.new_record? || node.vclass.kpath =~ /\A#{rel.this_kpath}/)
-        rel.start = node
-        rel

trunk/lib/parser/test/parser/zafu.yml

@@ -30 +30 @@
-  src: "this is <r:test super='life' is = \"fine\""
-  res: "this is <r:test super='life' is = \"fine\""
+
+#tag_param_has_bracket:
+#  src: "a special tag: <r:test p='<red>yo</red>'><r:hello/></r:test>"
+#  res: "a special tag: [test {= :p=>'<red>yo</red>'}][hello/][/test]"
-
-hello_not_closed:

trunk/test/helpers/zena_parser/basic.yml

@@ -904 +904 @@
-  res: "/input type='checkbox' name='node\[calendar_ids\]\[\]' value='11' checked='checked'.*zena.*hidden.*node\[calendar_ids\]\[\]' value=''/"
-
+checkbox_finder:
+  context:
+    node: 'opening'
+  src: "<r:checkbox role='calendar' values='projects in site'/>"
+  res: "/value=.21.*cleanWater.*input type=.checkbox. name=.node\[calendar_ids\]\[\]. value=.29. checked=.checked.*wiki/"
+
-input_set_value:
-  src: "<r:input type='hidden' name='icon_id' set_value='[main.id]'/>"

trunk/test/unit/relation_proxy_test.rb

@@ -99 +99 @@
-    assert rel = node.relation_proxy('blog')
-    assert_equal relations_id(:post_has_blogs), rel[:id]
+    
+    # Any new node can have a relation_proxy (used when forms contain the 'klass' attribute selected by the user).
+    node = secure!(Node) { Node.new_from_class('Node') }
+    assert rel = node.relation_proxy('blog')
+    assert_equal relations_id(:post_has_blogs), rel[:id]
-  end
-