zena 1.2.3 → 1.2.4

data/public/javascripts/grid.js

@@ -902,12 +902,20 @@ Grid.save = function(grid_id) {
     data.each(function(pair) {
       var id = pair.key
       var changes = pair.value
-      var attrs = {zjs:true, "opts[format]":grid.fdate}
+      var attrs = {}
+      if (!grid.list_name && !grid.rlist_name) {
+        // insert forced field values
+        var a = $(id).getAttribute('data-base')
+        if (a) attrs = a.evalJSON()
+      }
+      attrs.zjs = true
+      attrs["opts[format]"] = grid.fdate
       $H(changes).each(function(pair) {
         if (pair.key != '_new') {
           attrs['node['+pair.key+']'] = pair.value
         }
-      })
+      })  
+
 
       if (changes._new) {
         new Ajax.Request('/nodes', {
@@ -940,6 +948,7 @@ Grid.save = function(grid_id) {
           method: 'post'
         });
       } else {
+        // UPDATE
         new Ajax.Request('/nodes/' + id.replace(/^[^0-9]+/,''), {
           parameters: attrs,
           onSuccess: function(transport) {

data/public/javascripts/upload-progress.js

@@ -100,9 +100,11 @@ var UploadProgress = {
 	  Effect.Appear('progress_shell' + this.uuid) ;
   },
 
-  setAsError: function() {
-    $('progress_shell' + this.uuid).remove();
-    $('attachment' + this.uuid).show();
+  setAsError: function(error) {
+	  this.uploading = false
+		this.watcher.stop()
+		$('progress_text' + this.uuid).innerHTML  = error;
+    $('progress_bar' + this.uuid).setStyle({background:"#f88"})
   },
 
   setAsFinished: function() {

data/public/javascripts/zena.js

@@ -839,7 +839,11 @@ Zena.set_toggle = function(dom_id, definition) {
     if (elem.tagName == 'TR') {
       target = elem.select('td')[0];
     }
-    target.insert({top:"<input type='checkbox' class='cb'/>"});
+		var input_type = 'checkbox'
+		if (definition['arity'] == 'one') {
+			input_type = 'radio'
+		}
+    target.insert({top:"<input type='"+input_type+"' class='cb'/>"});
   }
 
   if (list.indexOf(id) == -1) {
@@ -879,7 +883,7 @@ Zena.toggle = function(elem, definition, id) {
       onSuccess: function() {
         if (definition['arity'] == 'one') {
           // uncheck all
-          definition['list'] = {};
+          definition['list'] = [];
           // search for siblings
           elem.siblings().each(function(s) {
             try {

data/public/stylesheets/upload-progress.css

@@ -1,4 +1,5 @@
 .progress_shell { display: table; background:#15242B; width:15em; padding:0; position:relative; border:2px solid #999;}
 .progress_text  { position:absolute; text-align:center; width:15em; color:#ccc;}
+.progress_text .errors  { color:#222;}
 .progress_bar   { background:#35f;}
 #UploadIFrame {width:0; height:0; border:0; }

data/test/fixtures/files/TestNode.zafu

@@ -68,8 +68,8 @@
     <p>Using "action='destroy'" to remove elements.</p>
     <ul id='destroy_list' do='block' do='projects in site'>
       <li do='add' klass='Project' after='self'/>
-      <li do='form'><r:input name='title'/></li>
-      <li class='#{title}' do='each'><r:link/> <span id='destroy_#{title}' do='link' action='destroy' update='destroy_list' do='t'>destroy</span></li>
+      <li do='form'><r:input name='title'/><r:input name='summary'/></li>
+      <li class='#{title}' do='each'><r:link/> <span id='destroy_#{summary}' do='link' action='destroy' update='destroy_list' do='t'>destroy</span></li>
     </ul>
   </div>
 

data/test/fixtures/files/translations_fr.yml

@@ -22,4 +22,5 @@ translations:
   assigned_:  '--'
   assigned_1: foo
   assigned_2: bar
-  assigned_3: baz
+  assigned_3: baz
+  foo_Note: "the Foo Note"

data/test/functional/acls_controller_test.rb

@@ -48,6 +48,12 @@ class AclsControllerTest < Zena::Controller::TestCase
             post :create, :acl => { :query => '%q{assigned_project}', :group_id => groups_id(:sky) }
           end
         end
+        
+        should 'not create acl with bad kpath' do
+          assert_difference('Acl.count', 0) do
+            post :create, :acl => { :query => '%q{assigned_project}', :group_id => groups_id(:sky), :create_kpath => 'TRI' }
+          end
+        end
       end # with admin rights
 
     end # creating an acl

data/test/functional/nodes_controller_test.rb

@@ -746,7 +746,7 @@ class NodesControllerTest < Zena::Controller::TestCase
     opening = secure!(Node) { nodes(:opening) }
     art = opening.find(:first, 'set_tag')
     assert_equal 5, art.l_status
-    put 'update', :id => art[:zip], :node => {:l_status => 54321}, :link_id => links_id(:opening_in_art)
+    put 'update', :id => art[:zip], :node => {:l_status => 54321, :link_id => links_id(:opening_in_art)}
     art = assigns(:node)
     assert_equal 54321, art.l_status
     # reload

data/test/functional/sites_controller_test.rb

@@ -22,6 +22,23 @@ class SitesControllerTest < Zena::Controller::TestCase
     end
   end
 
+
+  test 'should clear cache with GET' do
+    with_caching do
+      login(:anon)
+      @node = secure!(Node) { nodes(:status) }
+      filepath = "#{RAILS_ROOT}/sites/test.host/public/en/clear_cache_test.html"
+      assert !File.exist?(filepath)
+      secure!(CachedPage) { CachedPage.create(:expire_after => nil, :path => "/test.host/public/en/clear_cache_test.html", :content_data => "houbahouba", :node_id => @node[:id], :expire_with_ids => visitor.visited_node_ids) }
+      assert File.exist?(filepath)
+      assert CachedPage.find(:first, :conditions => ["path = ?", "/test.host/public/en/clear_cache_test.html"])
+      login(:lion)
+      get :clear_cache
+      assert !File.exist?(filepath)
+      assert !CachedPage.find(:first, :conditions => ["path = ?", "/test.host/public/en/clear_cache_test.html"])
+    end
+  end
+
   test 'clearing cache should clear zafu' do
     with_caching do
       login(:anon)
@@ -40,6 +57,8 @@ class SitesControllerTest < Zena::Controller::TestCase
     login(:tiger)
     get :index
     assert_response :missing
+    get :clear_cache
+    assert_response :missing
   end
 
   test "should get index" do

data/test/integration/navigation_test.rb

@@ -396,6 +396,13 @@ class NavigationTest < Zena::Integration::TestCase
     assert_response :missing
   end
 
+  def test_bad_url_format
+    get 'http://test.host/foo/bar'
+    assert_redirected_to 'http://test.host/en/foo/bar'
+    get 'http://test.host/en/foo/bar'
+    assert_response :missing
+  end
+
   def test_bad_url_without_notFound_template
     $_test_site = 'zena'
     Node.connection.execute "UPDATE nodes SET kpath='N' where id = #{nodes_id(:Node_not_found_zafu)}"

data/test/integration/query_node/filters.yml

@@ -94,6 +94,16 @@ class_filter:
   sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND (nodes.kpath LIKE 'NDI%' OR nodes.kpath = 'NPP') GROUP BY nodes.id ORDER BY nodes.zip ASC}"
   res: "Zena the wild CMS, Clean Water project, it's a lake, bird, flower, Autumn Tree"
 
+class_not_like:
+  src: "documents where class not like Image in site limit 3"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath NOT LIKE 'NDI%' AND nodes.kpath LIKE 'ND%' ORDER BY nodes.zip ASC LIMIT 3}"
+  res: "water, Forest, Project-changes-xml"
+
+class_not_equal:
+  src: "documents where class <> Image in site limit 3"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath <> 'NDI' AND nodes.kpath LIKE 'ND%' ORDER BY nodes.zip ASC LIMIT 3}"
+  res: "water, Forest, Project-changes-xml"
+
 class_filter_with_quotes:
   src: "nodes where class = 'Project' and title = 'k' in site"
   sql: "/nodes.kpath = 'NPP'/"

data/test/integration/zafu_compiler/action.yml

@@ -20,7 +20,7 @@ login_link:
     # Forces NodesController type of url and params
     fake_controller: 'nodes'
   src: "<r:login_link/>"
-  res: '<a href="/oo/projects-list/Clean-Water-project/page22.html">login</a>'
+  res: '<a href="/oo/projects-list/Clean-Water-project/page22.html" rel="nofollow">login</a>'
 
 logout_link_other_controller:
   src: "<r:login_link/>"
@@ -30,7 +30,7 @@ login_link_other_controller:
   context:
     visitor: 'anon'
   src: "<r:login_link/>"
-  res: '<a href="/login">login</a>'
+  res: '<a href="/login" rel="nofollow">login</a>'
 
 login_link_with_blocks:
   src: "<r:login_link>ONE ONE<r:else do='title'/></r:login_link>"
@@ -40,7 +40,7 @@ login_link_with_blocks_not_logged_in:
   context:
     visitor: 'anon'
   src: "<r:login_link><r:title/><r:else do='title'/></r:login_link>"
-  res: "<a href='/login'>status title</a>"
+  res: "<a rel='nofollow' href='/login'>status title</a>"
 
 visitor_link_not_logged_in:
   context:
@@ -90,4 +90,8 @@ swap_in_each_with_block:
 
 hand_made_swap:
   src: "<r:link update='_page' node[origin]='next_in_list(origin, \"todo,done\")' action='update'/>"
-  tem: "/node\[origin\]. => next_in_list_s\(@node.prop\['origin'\].*todo,done.*method:.put./"
+  tem: "/node\[origin\]. => next_in_list_s\(@node.prop\['origin'\].*todo,done.*method:.put./"
+
+versions_list:
+  src: "<r:versions_list/>"
+  res: "/td class=\"date\">2006-03-10</td>/"

data/test/integration/zafu_compiler/ajax.yml

@@ -80,7 +80,7 @@ each_add_with_form:
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
-  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li.*style.*none.*list1_0.*Ajax.Request.*input type='hidden' name='node\[parent_id\]' value=.29.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1/"
+  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li.*style.*none.*list1_0.*Ajax.Request.*name='t_url' value=.ajax/each/add/with/form/list1/"
 
 each_add_with_form_in_sub_block:
   context:
@@ -141,7 +141,7 @@ each_edit_cannot_write:
     node: 'cleanWater'
     visitor: 'anon'
   src: "<r:children><li do='each'><r:show attr='title'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:children>"
-  res: "/<li id='list1_24'>it's a lake</li>.*/"
+  res: "/<li id='list1_24'>it&#39;s a lake</li>.*/"
 
 add_each_publish:
   src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add' publish='true'/></ul>"
@@ -396,7 +396,7 @@ link_page_list:
 toggle:
   src: "<span do='toggle' set='favorite' for='visitor.node'/>"
   res: "<span class='toggle' id='list1_22'></span>"
-  js: "/var1 = \{list:\[39\], url:\"/nodes/13\", role:\"favorite\".*\"list1_22\"\].each.function.item. \{ Zena.set_toggle/"
+  js: "/tog1 = \{list:\[39\], url:\"/nodes/13\", role:\"favorite\".*\"list1_22\"\].each.function.item. \{ Zena.set_toggle/"
 
 toggle_attribute_in_each:
   context:
@@ -410,7 +410,7 @@ toggle_dyn_attribute_in_each:
     node: cleanWater
     rel: favorite
   src: "<ul do='pages'><li do='each' toggle='#{params[:rel]}' for='visitor.node' do='title'/></ul>"
-  tem: "/add_toggle_id\(\"list1_#\{var2.zip\}\", \"var2_tog\", \"#\{params\[:rel\]\}\",\{\}\)/"
+  tem: "/add_toggle_id\(\"list1_#\{var2.zip\}\", \"tog1\", \"#\{params\[:rel\]\}\",\{\}\)/"
   res: "/<ul><li class='toggle' id='list1_26'>crocodiles</li>/"
   js: "/list1_26.*each/"
 

data/test/integration/zafu_compiler/calendar.yml

@@ -44,18 +44,11 @@ calendar_bad_attr:
   src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= starsky and hutch < #{cal_end} in project'/>"
   res: "/<span class='method'>calendar</span> <span class='message'>Unknown field 'starsky'/"
 
-#calendar_l_date:
-#  context:
-#    ref_date: "2009-7-17"
-#    node: 'zena'
-#  src: "<div do='calendar' select='added_notes' date='l_date' />"
-#  res: "/<td class='ref'><span>17</span><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>opening</a></li></ol></td>/"
-#
-#calendar_hours:
-#  context:
-#    ref_date: "2009-7-17"
-#    node: 'zena'
-#  # I do not like the way we do this, the 'else' thing is not helping. Maybe we need some
-#  # extra zafu tags because it' messy: we have 3 lists (days, hours, nodes) ...
-#  src: "<div do='calendar' select='added_notes' date='l_date' split_hours='12'><r:if test='hour eq 0' do='[current_date]' format='%d'/><div do='void' set_class='hour_[hour]' do='each' do='title' join=', '/><r:else><r:if test='hour eq 0' do='[current_date]' format='%d'/><div do='void' set_class='hour_[hour]'></div></r:else></div>"
-#  res: "/<td class='ref'>17<div class='hour_0'></div><div class='hour_12'>opening</div></td>/"
+# Should render without errors.
+calendar_other_date:
+  src: |
+    <r:void set_date='date.advance(:months => 1)'>
+      <div do='calendar' attr='created_at' select='pages where #{cal_start} <= created_at and created_at < #{cal_end} in site'/>
+    </r:void>
+  res: '/Clean-Water-project/'
+  

data/test/integration/zafu_compiler/context.yml

@@ -6,7 +6,7 @@ default:
 
 each_group:
   src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:kpath/>: <r:each join=', ' do='title'/></p></r:nodes>"
-  res: "<p>NP: crocodiles, status title</p><p>NDI: it's a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
+  res: "<p>NP: crocodiles, status title</p><p>NDI: it&#39;s a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
 
 # set_var tested in eval.yml
 

data/test/integration/zafu_compiler/dates.yml

@@ -205,4 +205,8 @@ time_wday:
     node: opening
     tz: 'US/Pacific'
   src: "<r:Post?><b do='this.date.wday'/> <b do='this.date.wday(\"UTC\")'/></r:Post?>"
-  res: "<b>2</b> <b>3</b>"
+  res: "<b>2</b> <b>3</b>"
+
+date_id:
+  src: "<r:input type='date' name='updated_at' id='foobar'/>"
+  res: "/id='foobar'/"

data/test/integration/zafu_compiler/display.yml

@@ -77,7 +77,6 @@ show_title_link_http:
 show_title_link_attribute:
   context:
     node: 'bird_jpg'
-  old_src: "<r:title link='http://[name].com'/>"
   src: "<a href='http://#{title}.com' do='title'/>"
   res: "<a href='http://bird.com'>bird</a>"
 
@@ -256,7 +255,7 @@ icon:
   context:
     node: 'cleanWater'
   src: "<r:icon do='title'/>"
-  res: "it's a lake"
+  res: "it&#39;s a lake"
 
 img_image:
   context:

data/test/integration/zafu_compiler/forms.yml

@@ -46,24 +46,26 @@ select_class_existing_node:
   context:
     node: 'letter'
   src: "<r:form><r:select name='klass' root_class='Note'/></r:form>"
-  res: "/<select name=.node\[klass\]. id=.list1_klass.><option value=\"Note\">klass_Note<\/option>\n<option value=\"Letter\" selected=\"selected\">  klass_Letter<\/option>\n<option value=\"Post\">  klass_Post<\/option><\/select>/"
+  res: "/<select name=.node\[klass\]. id=.list1_klass.><option value=\"Note\">Note<\/option>\n<option value=\"Letter\" selected=\"selected\">  Letter<\/option>\n<option value=\"Post\">  Post<\/option><\/select>/"
 
 select_class_new_node:
   src: "<r:pages><r:each/><r:add/><r:form><r:select name='klass' root_class='Note' selected='Post'/></r:form>"
-  res: "/<select.*name=.node\[klass\].*klass_Note.*klass_Letter.*Post. selected=.selected./"
+  res: "/<select.*name=.node\[klass\].*Note.*Letter.*Post. selected=.selected./"
 
 select_class_kpath:
   src: "<r:select param='k' root_class='Note' attr='kpath'/>"
-  res: "/<select.*name=.k.*NN.*k_Note.*NNL.*k_Letter.*NNP.*k_Post/"
+  res: "/<select.*name=.k.*NN.*Note.*NNL.*Letter.*NNP.*Post/"
 
 select_class_tprefix:
-  src: "<r:select tprefix='foo' param='k' root_class='Note'/>"
-  tem: '/\["foo_Note", "Note"\]/'
-  res: "/foo_Note.*foo_Letter/"
+  context:
+    lang: fr
+  src: "<r:load dictionary='/Default skin/translations'><r:select tprefix='foo' param='k' root_class='Note'/></r:load>"
+  tem: '/\["the Foo Note", "Note"\]/'
+  res: "/the Foo Note.*Letter/"
 
 select_data:
   src: "<r:select data-d='foo' param='k' root_class='Note' attr='kpath'/>"
-  res: "/<select name=.k. data-d='foo'.*NN.*k_Note.*NNL.*k_Letter.*NNP.*k_Post/"
+  res: "/<select name=.k. data-d='foo'.*NN.*Note.*NNL.*Letter.*NNP.*Post/"
 
 select_nodes:
   src: "<r:form><r:select nodes='images in site' name='origin'></select></r:form>"
@@ -87,7 +89,7 @@ select_nodes_in_ajax:
 
 select_nodes_show_attr:
   src: "<r:form><r:select name='title' nodes='images in site' attr='ext' show='title'/></r:form>"
-  res: "/name=.node\[title\].[^>]+>.*<option value=\"jpg\">flower</option>\n<option value=\"jpg\">it's a lake</option>/"
+  res: "/name=.node\[title\].[^>]+>.*<option value=\"jpg\">flower</option>\n<option value=\"jpg\">it&#39;s a lake</option>/"
 
 select_time_zone:
   src: "<r:form><r:select type='time_zone' name='settings[tz]'/></r:form>"
@@ -105,7 +107,7 @@ select_prop:
 
 select_l_status:
   # Refactor select to use collection_select.
-  src: "<r:select name='l_status' values='1,2,3' tshow='en,fr,de'/>"
+  src: "<r:select name='l_status' values='1.0, 2.0, 3.0' tshow='en,fr,de'/>"
   tem: "/@node.l_status.to_s/"
 
 form_publish:
@@ -118,6 +120,20 @@ checkbox:
   src: "<r:checkbox role='calendar' nodes='11'/>"
   res: "/hidden.*node\[calendar_ids\]\[\]' value=''.*input type='checkbox' name='node\[calendar_ids\]\[\]' value='11' checked='checked'.*Zena/"
 
+checkbox_literal_auto_trans:
+  context:
+    node: 'people'
+  src: "<r:load dictionary='/Default skin/translations'><r:checkbox name='assigned' values='1,2'/></r:load>"
+  tem: "/foo/"
+  res: "/value='1'/> <span>foo</span>/"
+
+radio_literal_auto_trans:
+  context:
+    node: 'people'
+    lang: fr
+  src: "<r:load dictionary='/Default skin/translations'><r:radio name='assigned' values='1,2'/></r:load>"
+  res: "/value='1'/> <span>foo</span>/"
+  
 checkbox_literal:
   context:
     node: 'people'
@@ -273,6 +289,10 @@ label_on_checkbox:
   src: "<r:checkbox label='t' name='title' values='1,2'/>"
   res: "/<label>titre</label>.*input type='checkbox'"
 
+default_checkbox:
+  src: "<r:checkbox name='title' values='1' default='0'/>"
+  res: "/<input type='hidden' name='node\[title\]' value='0'/>/"
+  
 label_on_select:
   context:
     lang: fr
@@ -346,4 +366,11 @@ should_show_fields_for_columns:
     lang: 'fr'
   src: "<r:load dictionary='/Default skin/translations'><r:form><r:select name='assigned' values=',1,2,3'/></r:form></r:load>"
   tem: "/foo.*bar/"
-  res: "/value=\"1\">foo<\/option>\n<option value=\"2\">bar/"
+  res: "/value=\"1\">foo<\/option>\n<option value=\"2\">bar/"
+
+form_rel_status:
+  context:
+    node: 'cleanWater'
+  src: "<r:input name='set_tag_status'/>"
+  tem: "/other_status/"
+  res: "<input type='text' name='node[set_tag_status]' value='10.0'/>"

data/test/integration/zafu_compiler/query.yml

@@ -169,7 +169,7 @@ query_with_default:
     visitor: lion
     node: cleanWater
   src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
-  res: "crocodiles, it's a lake, The lake we love, Nice Bananas, parc opening, status title, water"
+  res: "crocodiles, it&#39;s a lake, The lake we love, Nice Bananas, parc opening, status title, water"
 
 query_with_param:
   # Live compile and query from params
@@ -257,16 +257,16 @@ select_with_type:
 select_in_from:
   src: "<div do='images select title as it from projects select title as pt in site' do='each' join=', '><r:pt/>: <r:it/></div>"
   tem: '/<%=h var2.attributes\["pt"\] %>: <%=h var2.attributes\["it"\] %>/'
-  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
+  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it&#39;s a lake</div>"
 
 select_in_from_saved:
   src: "<div do='images select title as it from projects select title as pt in site' do='set' list='this' do='list' do='each' join=', '><r:pt/>: <r:it/></div>"
   tem: '/<%=h var3.attributes\["pt"\] %>: <%=h var3.attributes\["it"\] %>/'
-  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
+  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it&#39;s a lake</div>"
 
 select_group:
   src: "<div do='images select title as it from projects select title as pt in site' do='group' by='pt' do='each_group' join=' / '><r:pt/>: <r:each join=', ' do='it'/></div>"
-  res: "<div>a wiki with Zena: bird, flower / Clean Water project: it's a lake</div>"
+  res: "<div>a wiki with Zena: bird, flower / Clean Water project: it&#39;s a lake</div>"
 
 select_group_count:
   src: "<div do='images select id.count as img_count from projects select id as pid, title as pt in site group by pid' do='each' join=', '><r:pt/>: <r:img_count/></div>"
@@ -280,7 +280,7 @@ query_errors:
   context:
     c: 'badaboum'
   src: "<r:query default='nodes' select='nodes in #{params[:c]}'><r:elsif test='query_errors' do='query_errors'/></r:query>"
-  res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope 'badaboum'.</span>"
+  res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope &#39;badaboum&#39;.</span>"
 
 query_count:
   context: