LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GreetingItem beachtet nun Berechtigungen für das IndexItem 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1129 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-10-02 11:34:00 +00:00
parent 596707a5e5
commit 8a437f3a3e
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
View File

@ -39,6 +39,7 @@ import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.london.navigation.Navigation; import com.arsdigita.london.navigation.Navigation;
import com.arsdigita.web.LoginSignal;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
/** /**
@ -51,6 +52,7 @@ import com.arsdigita.xml.Element;
* ContentPage or extend the ContentPage. * ContentPage or extend the ContentPage.
* *
* @author <a href="mailto:dominik@redhat.com">Dominik Kacprzak</a> * @author <a href="mailto:dominik@redhat.com">Dominik Kacprzak</a>
* @author Jens Pelzetter (jensp)
* @version $Id: GreetingItem.java 1473 2007-03-12 15:16:39Z chrisgilbert23 $ * @version $Id: GreetingItem.java 1473 2007-03-12 15:16:39Z chrisgilbert23 $
*/ */
public class GreetingItem extends AbstractComponent { public class GreetingItem extends AbstractComponent {
@ -63,7 +65,7 @@ public class GreetingItem extends AbstractComponent {
ContentItem item = (ContentItem) getObject(); ContentItem item = (ContentItem) getObject();
if (null == item || !item.isLive()) { if (null == item || !item.isLive()) {
return null; return null;
} }
if (!ContentItem.VERSION.equals(item.getVersion())) { if (!ContentItem.VERSION.equals(item.getVersion())) {
item = item.getLiveVersion(); item = item.getLiveVersion();
@ -81,19 +83,35 @@ public class GreetingItem extends AbstractComponent {
// Note that the xml that is generated is only of use if you DO NOT CACHE index pages. // Note that the xml that is generated is only of use if you DO NOT CACHE index pages.
// cg. // cg.
PermissionDescriptor edit = new PermissionDescriptor(PrivilegeDescriptor. PermissionDescriptor edit = new PermissionDescriptor(
get(SecurityManager.CMS_EDIT_ITEM), item, currentParty); PrivilegeDescriptor.get(SecurityManager.CMS_EDIT_ITEM),
item,
currentParty);
if (PermissionService.checkPermission(edit)) { if (PermissionService.checkPermission(edit)) {
content.addAttribute("canEdit", "true"); content.addAttribute("canEdit", "true");
} }
PermissionDescriptor publish = new PermissionDescriptor(PrivilegeDescriptor. PermissionDescriptor publish = new PermissionDescriptor(
get(SecurityManager.CMS_PUBLISH), item, currentParty); PrivilegeDescriptor.get(SecurityManager.CMS_PUBLISH),
item,
currentParty);
if (PermissionService.checkPermission(publish)) { if (PermissionService.checkPermission(publish)) {
content.addAttribute("canPublish", "true"); content.addAttribute("canPublish", "true");
} }
ContentBundle bundle = (ContentBundle) item; /**
* jensp 2011-10-02: GreetingItem/IndexItem was displayed even if the
* current party has no access to the item.
*/
PermissionDescriptor read = new PermissionDescriptor(
PrivilegeDescriptor.get(SecurityManager.CMS_READ_ITEM),
item,
currentParty);
if (!PermissionService.checkPermission(read)) {
throw new LoginSignal(request);
}
ContentBundle bundle = (ContentBundle) item;
/* Fix by Jens Pelzetter, 2009-08-28 /* Fix by Jens Pelzetter, 2009-08-28
* bundle.getPrimaryInstance() does not care about the preferred * bundle.getPrimaryInstance() does not care about the preferred
* languages * languages
@ -103,15 +121,14 @@ public class GreetingItem extends AbstractComponent {
* Fixed by using negotiate() instead, which takes the locale * Fixed by using negotiate() instead, which takes the locale
* send by the User Client in account and tries to find a suitable * send by the User Client in account and tries to find a suitable
* language version. * language version.
*/ */ //ContentItem baseItem = bundle.getPrimaryInstance();
//ContentItem baseItem = bundle.getPrimaryInstance();
ContentItem baseItem = bundle.getInstance(GlobalizationHelper. ContentItem baseItem = bundle.getInstance(GlobalizationHelper.
getNegotiatedLocale().getLanguage()); getNegotiatedLocale().getLanguage());
// If there is no matching language version for this content item // If there is no matching language version for this content item
if (baseItem == null) { if (baseItem == null) {
// get the primary instance instead (fallback) // get the primary instance instead (fallback)
baseItem = bundle.getPrimaryInstance(); baseItem = bundle.getPrimaryInstance();
} }
Element itemEl = content.newChildElement("cms:item", Element itemEl = content.newChildElement("cms:item",
CMS.CMS_XML_NS); CMS.CMS_XML_NS);
@ -119,25 +136,26 @@ public class GreetingItem extends AbstractComponent {
//XML generation extendable (use another renderer etc.) //XML generation extendable (use another renderer etc.)
/*ContentItemXMLRenderer renderer = /*ContentItemXMLRenderer renderer =
new ContentItemXMLRenderer(itemEl); new ContentItemXMLRenderer(itemEl);
renderer.setWrapAttributes(true); renderer.setWrapAttributes(true);
renderer.setWrapRoot(false); renderer.setWrapRoot(false);
renderer.setWrapObjects(false); renderer.setWrapObjects(false);
renderer.walk(baseItem, SimpleXMLGenerator.ADAPTER_CONTEXT);*/ renderer.walk(baseItem, SimpleXMLGenerator.ADAPTER_CONTEXT);*/
generateGreetingItemXml(itemEl, baseItem); generateGreetingItemXml(itemEl, baseItem);
for(ExtraXMLGenerator generator : baseItem.getExtraXMLGenerators()) { for (ExtraXMLGenerator generator : baseItem.getExtraXMLGenerators()) {
try { try {
generator.generateXML(baseItem, content, new PageState(null, request, generator.generateXML(baseItem, content, new PageState(null,
response)); request,
response));
} catch (ServletException ex) { } catch (ServletException ex) {
s_log.error(ex); s_log.error(ex);
} }
} }
return content; return content;
} }
/** /**