Changeset 1215

Timestamp:

2008-10-05 15:58:26 (3 months ago)

Author:

gaspard

Message:

commit 7e3ba0069afa540ea98fd9aef3345dfee7d6a679
Author: Gaspard Bucher <gaspard@teti.ch>

Fixed a bug where default text for versions was showing 'edit' instead of the title.

Files:

• trunk/app/models/contact_version.rb (modified) (1 diff)
• trunk/app/models/node.rb (modified) (3 diffs)
• trunk/config/zena.rb (modified) (2 diffs)
• trunk/db/init/base/skins/default/Node.zafu (modified) (1 diff)
• trunk/lib/multiversion.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/test/unit/node_test.rb (modified) (1 diff)

trunk/app/models/contact_version.rb

@@ -31 +31 @@
-      end
-      
- = node.old_version
-
+_title = node.old_title
+_title
-      # what changed ?
-.
+_
-      fullname_changed = content.fullname != @old_fullname
-      # 1. both
-      if title_changed && fullname_changed
-        # ignore
-version.
+
-        # content changed and title was in sync
-        self.title = content.fullname

trunk/app/models/node.rb

@@ -128 +128 @@
-=end
-class Node < ActiveRecord::Base
-version
+title
-  zafu_readable      :name, :created_at, :updated_at, :event_at, :log_at, :kpath, :user_zip, :parent_zip, :project_zip,
-                     :section_zip, :skin, :ref_lang, :fullpath, :rootpath, :position, :publish_from, :max_status, :rgroup_id, 
@@ -486 +486 @@
-                  define_method(:read) do
-                    if insert_zafu_headings
-
+  <r:uses_calendar/>\n
-                    else
-                      o_read
@@ -1558 +1558 @@
-    # Try to keep node name in sync with published v_title in ref_lang. This is set after_publish.
-    def sync_name
-version.nil? || version.lang != ref_lang || name == version.title.url_name || old.name != @old_version.
+title.nil? || version.lang != ref_lang || name == version.title.url_name || old.name != @old_
-      update_attributes(:name => version.title.url_name)
-    end

trunk/config/zena.rb

@@ -3 +3 @@
-require 'uuidtools'
-require "#{RAILS_ROOT}/config/version"
+require 'fileutils'
+
-AUTHENTICATED_PREFIX = "oo"
-SITES_ROOT = "#{RAILS_ROOT}/sites"
@@ -22 +24 @@
-  puts "\n** WARNING: drb server not running. Upload progress will not work."
-  puts " * WARNING: you should start the drb server with 'lib/upload_progress_server.rb start'\n\n"
+end
+
+unless File.exist?(File.join(File.dirname(__FILE__), 'database.yml'))
+  FileUtils.cp(File.join(File.dirname(__FILE__), 'database_example.yml'), File.join(File.dirname(__FILE__), 'database.yml'))
+end
+
+unless File.exist?(File.join(File.dirname(__FILE__), '..', 'log'))
+  FileUtils.mkpath(File.join(File.dirname(__FILE__), '..', 'log'))
-end
-

trunk/db/init/base/skins/default/Node.zafu

@@ -11 +11 @@
-  </r:void>
-
- list='prototype,effects,zena'
+
-  <r:uses_calendar/>
-</head>

trunk/lib/multiversion.rb

@@ -484 +484 @@
-          
-          if ok && publish_after_save
-
+
+
+
-              ok = apply(:publish)
-            elsif can_apply?(:propose)
@@ -545 +547 @@
-            
-            if v && (v.user_id == visitor[:id]) && (v.status == Zena::Status[:red] || redit)
-version = @version
-  
+title = @version.title # node sync_name leaking here...
+
-            elsif v
-              errors.add('base', "(#{v.user.login}) is editing this node")

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

@@ -3038 +3038 @@
-      elsif node_kind_of?(Node)
-        "<%= #{node}.v_title %>"
+      elsif node_kind_of?(Version)
+        "<%= #{node}.title %>"
-      else
-        _('edit')

trunk/test/unit/node_test.rb

@@ -1378 +1378 @@
-  end
-  
+  def test_sync_name_on_v_title_change_auto_pub_no_sync
+    Site.connection.execute "UPDATE sites set auto_publish = 1, redit_time = 3600 WHERE id = #{sites_id(:zena)}"
+    Version.connection.execute "UPDATE versions set updated_at = '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}' WHERE node_id IN (#{nodes_id(:status)},#{nodes_id(:people)})"
+    login(:tiger)
+    # was not in sync
+    node = secure!(Node) { nodes(:status) }
+    assert node.update_attributes(:v_title => 'simply different')
+    assert_equal 'status', node.name
+    visitor.lang = 'fr'
+    # not ref lang
+    node = secure!(Node) { nodes(:people) }
+    assert node.update_attributes(:v_title => 'nice people')
+    assert_equal 'fr', node.v_lang
+    assert_equal 'people', node.name
+  end
+  
+  def test_sync_name_on_v_title_change_auto_pub
+    Site.connection.execute "UPDATE sites set auto_publish = 1, redit_time = 3600 WHERE id = #{sites_id(:zena)}"
+    Version.connection.execute "UPDATE versions set updated_at = '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}' WHERE node_id IN (#{nodes_id(:people)})"
+    login(:tiger)
+    # was in sync, correct lang
+    node = secure!(Node) { nodes(:people) }
+    assert node.update_attributes(:v_title => 'nice people')
+    assert_equal 'nicePeople', node.name
+  end
+  
-  # FIXME: write test
-  def test_assets