[Aplaws-commit] r954 - in trunk/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:39:51 +0200 (Tue, 04 Oct 2005)
New Revision: 954

Added:
   trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/
   trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
   trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql
   trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql
Modified:
   trunk/ccm-cms/application.xml
   trunk/ccm-cms/src/ccm-cms.upgrade
   trunk/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java
Log:
  Fix for SF bug [ 1311974 ] Important Permission Problem.
When resetting the perm context for a draft folder, we check
whether the live version exists.  If yes, we set the context of
the live version to that of its draft master.  Setting it to
null and copying the permissions by value is completely and
utterly wrong.

  Provided an upgrade script to fix incorrect folder contexts.


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

Added: trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql	2005-10-03 18:27:52 UTC (rev 953)
+++ trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql	2005-10-04 12:39:51 UTC (rev 954)
@@ -0,0 +1,7 @@
+
+update object_context set
+      context_id = (select master_id from cms_items where item_id = object_context.object_id )
+  where object_id in (
+      select f.folder_id from cms_folders f, cms_items ci
+      where f.folder_id = ci.item_id  and ci.version = 'live'
+  ) ;


Property changes on: trunk/ccm-cms/sql/ccm-cms/default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
___________________________________________________________________
Name: svn:keywords
   + Id Author URL

Added: trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql	2005-10-03 18:27:52 UTC (rev 953)
+++ trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql	2005-10-04 12:39:51 UTC (rev 954)
@@ -0,0 +1,3 @@
+
+@@ ../default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
+


Property changes on: trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.1.1-6.2.0.sql
___________________________________________________________________
Name: svn:keywords
   + Id Author URL

Added: trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql	2005-10-03 18:27:52 UTC (rev 953)
+++ trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql	2005-10-04 12:39:51 UTC (rev 954)
@@ -0,0 +1,5 @@
+begin;
+
+\i ../default/upgrade/6.1.1-6.2.0/fix-live-folder-security-context.sql
+
+commit;


Property changes on: trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.1.1-6.2.0.sql
___________________________________________________________________
Name: svn:keywords
   + Id Author URL

Modified: trunk/ccm-cms/src/ccm-cms.upgrade
===================================================================
--- trunk/ccm-cms/src/ccm-cms.upgrade	2005-10-03 18:27:52 UTC (rev 953)
+++ trunk/ccm-cms/src/ccm-cms.upgrade	2005-10-04 12:39:51 UTC (rev 954)
@@ -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: trunk/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java	2005-10-03 18:27:52 UTC (rev 953)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java	2005-10-04 12:39:51 UTC (rev 954)
@@ -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();