[Aplaws-commit] r987 - in releases/1.0.3/ccm-cms: . src/com/arsdigita/cms/ui/permissions

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

Author: sskracic
Date: 2005-11-09 13:49:31 +0100 (Wed, 09 Nov 2005)
New Revision: 987

Modified:
   releases/1.0.3/ccm-cms/application.xml
   releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java
Log:
  Integrated r986 from trunk (excess permission records on live folders).


Modified: releases/1.0.3/ccm-cms/application.xml
===================================================================
--- releases/1.0.3/ccm-cms/application.xml	2005-11-09 12:47:09 UTC (rev 986)
+++ releases/1.0.3/ccm-cms/application.xml	2005-11-09 12:49:31 UTC (rev 987)
@@ -3,7 +3,7 @@
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
   version="6.2.0"
-  release="5"
+  release="6"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java
===================================================================
--- releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java	2005-11-09 12:47:09 UTC (rev 986)
+++ releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java	2005-11-09 12:49:31 UTC (rev 987)
@@ -157,19 +157,6 @@
                                                  acsObj,
                                                  uos.getParty());
                         PermissionService.grantPermission(pmd);
-
-                        if (acsObj instanceof ContentItem) {
-                            ContentItem item = (ContentItem) acsObj;
-                            ContentItem liveVersion = item.getLiveVersion();
-                            if (liveVersion != null) {
-                                pmd = new
-                                    PermissionDescriptor(PrivilegeDescriptor.
-                                                         get(privs[k]),
-                                                         liveVersion,
-                                                         uos.getParty());
-                                PermissionService.grantPermission(pmd);
-                            }
-                        }
                     }
                 }
             }