[Aplaws-commit] r955 - in releases/1.0.3/ccm-cms: . sql/ccm-cms/default/upgrade sql/ccm-cms/default/upgrade/6.1.1-6.2.0 sql/ccm-cms/upgrade src src/com/arsdigita/cms/ui

[<ssk...@vh...>]

Author: sskracic
Date: 2005-10-04 14:43:45 +0200 (Tue, 04 Oct 2005)
New Revision: 955

Added:
   releases/1.0.3/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/
   releases/1.0.3/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
   releases/1.0.3/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql
   releases/1.0.3/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql
Removed:
   releases/1.0.3/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
Modified:
   releases/1.0.3/ccm-cms/application.xml
   releases/1.0.3/ccm-cms/src/ccm-cms.upgrade
   releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java
Log:
  Integrated r954 onto 1.0.3 release: fixed incorrect
security context of live folders when the 'Use custom permissions'
option is selected.


Modified: releases/1.0.3/ccm-cms/application.xml
===================================================================
--- releases/1.0.3/ccm-cms/application.xml	2005-10-04 12:39:51 UTC (rev 954)
+++ releases/1.0.3/ccm-cms/application.xml	2005-10-04 12:43:45 UTC (rev 955)
@@ -3,7 +3,7 @@
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
   version="6.2.0"
-  release="3"
+  release="4"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Copied: releases/1.0.3/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0 (from rev 954, trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0)

Deleted: releases/1.0.3/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql

Copied: releases/1.0.3/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql (from rev 954, trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql)

Copied: releases/1.0.3/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql (from rev 954, trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql)

Copied: releases/1.0.3/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql (from rev 954, trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql)

Modified: releases/1.0.3/ccm-cms/src/ccm-cms.upgrade
===================================================================
--- releases/1.0.3/ccm-cms/src/ccm-cms.upgrade	2005-10-04 12:39:51 UTC (rev 954)
+++ releases/1.0.3/ccm-cms/src/ccm-cms.upgrade	2005-10-04 12:43:45 UTC (rev 955)
@@ -5,4 +5,7 @@
   <version from="6.1.0" to="6.1.1">
     <script sql="ccm-cms/upgrade/::database::-6.1.0-6.1.1.sql"/>
   </version>
+  <version from="6.1.1" to="6.2.0">
+    <script sql="ccm-cms/upgrade/::database::-6.1.1-6.2.0.sql"/>
+  </version>
 </upgrade>

Modified: releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java
===================================================================
--- releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java	2005-10-04 12:39:51 UTC (rev 954)
+++ releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java	2005-10-04 12:43:45 UTC (rev 955)
@@ -463,7 +463,7 @@
             PermissionService.clonePermissions(currentFolder);
             Folder liveFolder = (Folder) currentFolder.getLiveVersion();
             if (liveFolder != null) {
-                PermissionService.clonePermissions(liveFolder);
+                PermissionService.setContext(liveFolder, currentFolder);
             }
         } else {
             ACSObject parent = currentFolder.getParent();