[Aplaws-commit] r772 - ccm-cms/trunk/src/com/arsdigita/cms/ui/folder

[<fa...@vh...>]

Author: fabrice
Date: 2005-09-12 16:53:47 +0200 (Mon, 12 Sep 2005)
New Revision: 772

Modified:
   ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderEditForm.java
   ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderForm.java
Log:
Rename live version of folders too



Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderEditForm.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderEditForm.java	2005-09-12 14:52:37 UTC (rev 771)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderEditForm.java	2005-09-12 14:53:47 UTC (rev 772)
@@ -24,6 +24,7 @@
 import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.cms.Folder;
+
 import org.apache.log4j.Logger;
 
 class FolderEditForm extends FolderBaseForm {
@@ -78,8 +79,17 @@
 
             folder.setLabel((String) m_title.getValue(state));
             folder.setName((String) m_fragment.getValue(state));
+            folder.save();
 
-            folder.save();
+            // also modify the live version of the folder,
+            // otherwise items within this folder will keep
+            // using the old URL, for example
+            Folder live = (Folder) folder.getLiveVersion();
+            if (live != null) {
+                live.setLabel((String) m_title.getValue(state));
+                live.setName((String) m_fragment.getValue(state));
+                live.save();
+            }
         }
     }
 }

Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderForm.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderForm.java	2005-09-12 14:52:37 UTC (rev 771)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderForm.java	2005-09-12 14:53:47 UTC (rev 772)
@@ -98,6 +98,16 @@
         folder.setName(name);
         folder.setLabel(label);
         folder.save();
+
+        // also modify the live version of the folder,
+        // otherwise items within this folder will keep
+        // using the old URL, for example
+        Folder live = (Folder) folder.getLiveVersion();
+        if (live != null) {
+            live.setName(name);
+            live.setLabel(label);
+            live.save();
+        }
     }
 
     /**