Changeset 1154

Timestamp:

2008-09-15 20:20:44 (4 months ago)

Author:

gaspard

Message:

Added new 't_id' parameter for [form]. This (global) parameter is used with ajax rendering.
It lets you change the node that is used as main node '@node' when rendering the template. This
is useful when you want to update a dropped node and set comments but still want to render the
template in the receiver's context. See 'Node-test.zafu' for an example.

Files:

• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/app/views/nodes/update.rjs (modified) (1 diff)
• trunk/lib/parser/lib/rules/zena.rb (modified) (3 diffs)
• trunk/test/fixtures/files/Node-test.zafu (modified) (2 diffs)
• trunk/test/helpers/zena_parser/ajax.yml (modified) (3 diffs)

trunk/app/helpers/application_helper.rb

@@ -18 +18 @@
-  # RJS to update a page after create/update/destroy
-  def update_page_content(page, obj)
+    if params[:t_id] && @node.errors.empty?
+      @node = secure(Node) { Node.find_by_zip(params[:t_id])}
+    end
+    
-    base_class = obj.kind_of?(Node) ? Node : obj.class
-    

trunk/app/views/nodes/update.rjs

@@ -1 +1 @@
-if params[:dom_id] && !params[:t_url]
-params[:node].keys
+(params[:node].keys - ['v_status'])
-  if params[:zazen] == 'true'
-    page.replace_html params[:dom_id], "<span class='zazen_edit'>#{link_to_remote(_('edit'), :url => edit_node_path(@node[:zip]) + "?attribute=#{attribute}&dom_id=#{params[:dom_id]}#{params[:publish] == 'true' ? '&publish=true' : ''}&zazen=true", :method => :get)}</span>" + zazen(params[:node][attribute])

trunk/lib/parser/lib/rules/zena.rb

@@ -979 +979 @@
-        
-        hidden_fields['t_url'] = template_url
+        if t_id = @params[:t_id]
+          hidden_fields['t_id']  = parse_attributes_in_value(t_id)
+        end
-        
-        erb_dom_id = @context[:saved_template] ? '<%= params[:dom_id] %>' : self.erb_dom_id
@@ -1430 +1433 @@
-        # normal rendering: not the start of a saved template
-        if is_draggable || descendant('unlink')
-          @html_tag ||= 'div'
-          out "<% #{var}_dom_ids = [] -%>"
-        end
@@ -3156 +3158 @@
-      else
-        insert = ''
-
+
+
+
-      
-      if id_hash
-
-
-
-
-
-
-
+
+
+
+
-      [res, drag_handle]
-    end

trunk/test/fixtures/files/Node-test.zafu

@@ -117 +117 @@
-</ul>
-
-
+ (comment on receiving)
-
-<div style='border:1px solid #400; min_width:100px; min_height:100px;' do='drop' change='params' d='[id]' do='if' test='param:d'>
@@ -141 +141 @@
-<hr/>
-
+<h3>drop reload with param (comment on dropped)</h3>
+
+<div style='border:1px solid #400; min_width:100px; min_height:100px;' do='drop' change='params' d='[id]' do='if' test='param:d'>
+  <r:node where='id eq param:d' in='site'>
+    Change icon to <r:img mode='tiny'/> ?
+    <r:form t_id='[main.id]'>
+      <r:input type='hidden' name='icon_for_id' set_value='[main.id]'/>
+      <r:input type='hidden' name='m_title' set_value='icon for [main.name]'/>
+      <r:textarea name='m_text'/>
+      <input type='submit'/>
+    </r:form>
+  </r:node>
+  <r:else>
+    please drop a node to change the icon
+    <r:icon><r:img mode='pv'/>
+    <ul do='comments'>
+    <li do='each'><b do='[title]'/> <b do='[author_name]'/>
+    <div do='{text}'/>
+    </li>
+    </ul></r:icon></r:else>
+</div>
+
+<hr/>
-<h2>notes & comments</h2>
-

trunk/test/helpers/zena_parser/ajax.yml

@@ -74 +74 @@
-  context:
-    node: 'wiki'
-r:each><li><r:show attr='name'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:each>
+li do='each'><r:show attr='name'>blah</r:show> <r:edit>edit</r:edit></li>\n
-  res: "/<li id='list1_30'>bird <a href='/nodes/30/edit\?t_url=.*' onclick=\"new Ajax.Request\('/nodes/30/edit\?t_url=%2Feach%2Fedit%2Fwith%2Fform%2Flist/"
-
@@ -87 +87 @@
-    node: 'cleanWater'
-    visitor: 'anon'
-r:each><li><r:show attr='name'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:each>
+li do='each'><r:show attr='name'>blah</r:show> <r:edit>edit</r:edit></li>\n
-  res: "/<li id='list1_24'>lake </li>.*/"
-
@@ -192 +192 @@
-  tem: "/<div class='drop' id='list1'><%= params\[:d\] %>.*drop\?params\[d\]=%5Bid%5D/"
-
+drop_param_in_each:
+  src: "<r:pages do='each' do='drop' change='params' d='[id]'><r:show param='d'/></r:pages>"
+  tem: "/<div class='drop' id='list1_<%= var1.zip %>'><%= params\[:d\] %>.*drop\?params\[d\]=%5Bid%5D/"
+
-swap_in_each:
-  src: "<r:pages><li do='each'><span do='swap' attr='d_status' states='todo,done,alert'/></li></r:pages>"