[fc] Repository: plone.app.linkintegrity

Branch: refs/heads/master
Date: 2015-09-10T15:32:59+02:00
Author: Philip Bauer (pbauer) <[email protected]>
Commit: plone/plone.app.linkintegrity@562833c

Don't show delete_confirmation_info twice in delete_confirmation. Fixes #27

Files changed:
M CHANGES.rst
M plone/app/linkintegrity/browser/delete_confirmation_info.pt

last_commit.txt

@@ -1,42 +1,58 @@
-Repository: plone.app.layout
+Repository: plone.app.linkintegrity
 
 
 Branch: refs/heads/master
-Date: 2015-09-10T15:27:24+02:00
-Author: Maurits van Rees (mauritsvanrees) <[email protected]>
-Commit: https://github.com/plone/plone.app.layout/commit/c29e1cb4251e478797dfed4cd6a52e3e4f0916ff
+Date: 2015-09-10T15:32:59+02:00
+Author: Philip Bauer (pbauer) <[email protected]>
+Commit: https://github.com/plone/plone.app.linkintegrity/commit/562833c1ff6da4e967788e14690077b0b6942f74
 
-Fixed AttributeError for ac_permissions.
-
-Happens in plone.app.portlets tests.
+Don't show delete_confirmation_info twice in delete_confirmation. Fixes #27
 
 Files changed:
-M plone/app/layout/globals/layout.py
-
-diff --git a/plone/app/layout/globals/layout.py b/plone/app/layout/globals/layout.py
-index ae2c3ef..af191c0 100644
---- a/plone/app/layout/globals/layout.py
-+++ b/plone/app/layout/globals/layout.py
-@@ -22,7 +22,7 @@
- from zope.interface import alsoProvides
- from zope.interface import implements
- from zope.publisher.browser import BrowserView
--from AccessControl.PermissionRole import rolesForPermissionOn
+M CHANGES.rst
+M plone/app/linkintegrity/browser/delete_confirmation_info.pt
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 49747b3..cfdb9c6 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -4,7 +4,8 @@ Changelog
+ 3.0.1 (unreleased)
+ ------------------
+
+-- Nothing changed yet.
++- Don't show delete_confirmation_info twice in delete_confirmation. Fixes #27
++  [pbauer]
+
+
+ 3.0 (2015-09-08)
+diff --git a/plone/app/linkintegrity/browser/delete_confirmation_info.pt b/plone/app/linkintegrity/browser/delete_confirmation_info.pt
+index 5acddd4..048e75f 100644
+--- a/plone/app/linkintegrity/browser/delete_confirmation_info.pt
++++ b/plone/app/linkintegrity/browser/delete_confirmation_info.pt
+@@ -1,12 +1,11 @@
+-<article id="content"
++<tal:block
+   xmlns="http://www.w3.org/1999/xhtml"
+   xml:lang="en"
+-  lang="en"
+   tal:define="breaches python:view.breaches"
+   tal:condition="breaches"
+   i18n:domain="plone">
+-    <h1 class="documentFirstHeading"
+-        i18n:translate="linkintegrity_breaches_title">Potential link breakage</h1>
 +
++    <h2 i18n:translate="linkintegrity_breaches_title">Potential link breakage</h2>
 
- class LayoutPolicy(BrowserView):
-     """A view that gives access to various layout related functions.
-@@ -181,9 +181,9 @@ def bodyClass(self, template, view):
+     <div id="content-core">
+         <p i18n:translate="linkintegrity_instructions">
+@@ -53,4 +52,4 @@
 
-         # permissions required. Useful to theme frontend and backend differently
-         permissions = []
--        if not getattr(view, '__ac_permissions__'):
-+        if not getattr(view, '__ac_permissions__', tuple()):
-             permissions = ['none']
--        for permission,roles in getattr(view, '__ac_permissions__', tuple()):
-+        for permission, roles in getattr(view, '__ac_permissions__', tuple()):
-             permissions.append(normalizer.normalize(permission))
-         if 'none' in permissions or 'view' in permissions:
-             body_classes.append('frontend')
+         </div>
+     </div>
+-</article>
+\ No newline at end of file
++</tal:block>
+\ No newline at end of file