Correctly cleanup path for category setter

product/CMFCategory/tests/testCMFCategory.py

@@ -1148,6 +1148,25 @@ class TestCMFCategory(ERP5TypeTestCase):
     self.assertEqual(list(related), [person.getRelativeUrl()])
     person._setTest1Value(a)
     self.assertEqual(list(related), [])
+    
+  def test_Category_setCategoryValue(self):
+    # Test all case of setting categories values
+    region_value = self.portal.portal_categories.resolveCategory('region/europe')
+    region_value2 = self.portal.portal_categories.resolveCategory('region/europe/west')
+    self.assertNotEqual(None,region_value)
+    self.assertNotEqual(None,region_value2)
+    
+    newPerson = self.getPersonModule().newContent
+    person = newPerson()
+    person.setRegionValue(region_value)
+    person2 = newPerson(region_value=region_value2)
+    
+    self.tic()
+    
+    self.assertEqual(person.getRegion(), 'europe')
+    self.assertTrue('region/europe' in person.getCategoryList())
+    self.assertEqual(person2.getRegion(), 'europe/west')
+    self.assertTrue('region/europe/west' in person2.getCategoryList())
 
 
 def test_suite():

product/ERP5Type/Base.py

@@ -1818,9 +1818,10 @@ class Base( CopyContainer,
   def _setValue(self, id, target, spec=(), filter=None, portal_type=(), keep_default=1,
                                   checked_permission=None):
     getRelativeUrl = self.getPortalObject().portal_url.getRelativeUrl
+        
     def cleanupCategory(path):
       # prevent duplicating base categories and storing "portal_categories/"
-      for start_string in ("%s/" % id, "portal_categories/"):
+      for start_string in ("portal_categories/", "%s/" % id):
         if path.startswith(start_string):
           path = path[len(start_string):]
       return path