Using any character to build kpath if no character from the class nam…

…e can be used.

History.txt

@@ -18,6 +18,7 @@
  * Added 'ssl_on_auth' option to force https after (and during) login. <=== TODO: Document
  * Removing evaluated strings if copy_id is blank.
  * Exporting relations by class name instead of kpath (may differ from site to site).
+ * Using any character to build kpath if no character from the class name can be used.
 
 == 1.2.0, 1.2.1 2012-05-01
 

app/models/virtual_class.rb

@@ -509,8 +509,9 @@ def index_groups
     def rebuild_kpath(superclass)
       index = 0
       kpath = nil
-      while index < self[:name].length
-        try_kpath = superclass.kpath + self[:name][index..index].upcase
+      try_keys = "#{name}ABCDEFGHIJKLMNOPQRSTUCWXYZ1234567890"
+      while index < try_keys.length
+        try_kpath = superclass.kpath + try_keys[index..index].upcase
         if found = VirtualClass.find_by_kpath(try_kpath)
           if found.id && found.id == self[:id]
             kpath = try_kpath

test/unit/virtual_class_test.rb

@@ -185,6 +185,10 @@ def test_new_conflict_kpath
     assert !vclass.new_record?
     assert_not_equal Section.kpath, vclass.kpath
     assert_equal 'NPU', vclass.kpath
+    # New class without any free key
+    vclass = VirtualClass.create(:superclass => 'Page', :name => 'U', :create_group_id =>  groups_id(:public))
+    assert !vclass.new_record?
+    assert_equal 'NPA', vclass.kpath
   end
 
   context 'Updating a VirtualClass' do