Conjunto de mudanças 6509 no repositório publico

Timestamp:

16/06/2012 19:39:26 (9 anos atrás)

Autor:

mazza

Mensagem:

boxes: refatoracao: nomes melhores

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis

Arquivos:

• browser/boxes/manager.py (modificado) (3 diffs)
• browser/boxes/templates/basebox.html (movido) (movido de PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/templates/editablebox.html) (1 diff)
• tests/testunitboxes.py (modificado) (2 diffs)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/manager.py

@@ -24 +24 @@
 template_factory = Environment(loader=PackageLoader(__name__))
 
-class EditableBox(object):
+class BaseBox(object):
+    """Base abstract class for editable boxes.
+    """
 
-    TEMPLATE_NAME = 'editablebox.html'
+    TEMPLATE_NAME = 'basebox.html'
 
     def __init__(self, permission=ModifyPortalContent):
@@ -32 +34 @@
 
     def __call__(self, context):
-        editablebox_template = template_factory.get_template(self.TEMPLATE_NAME)
-        return editablebox_template.render(
+        basebox_template = template_factory.get_template(self.TEMPLATE_NAME)
+        return basebox_template.render(
             box = self,
-            is_editable = self.is_editable(context),
+            has_permission = self.has_permission(context),
             inner = self.inner_render(context))
 
-    def is_editable(self, context):
+    def has_permission(self, context):
         return getSecurityManager().checkPermission(self.permission, context)
 
@@ -53 +55 @@
 
 
-class Box(EditableBox):
+class Box(BaseBox):
 
     ALL_BOXES_KEY = 'il.portalinterlegis.boxes'

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/templates/basebox.html

@@ -1 @@
-<div id="{{ box.id }}"{% if is_editable %} class ="editable-box" {% endif %}>
+<div id="{{ box.id }}"{% if has_permission %} class ="editable-box" {% endif %}>
   {{ inner }}
-  {%- if is_editable %}
+  {%- if has_permission %}
   <a class="editable-box-link" href="{{ box.edit_href }}">
     <img src="pencil_icon.png" width="16" height="16" alt="Edite esta caixa"/>

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testunitboxes.py

@@ -89 +89 @@
     pass
 
-from il.portalinterlegis.browser.boxes.manager import template_factory, EditableBox
+from il.portalinterlegis.browser.boxes.manager import template_factory, BaseBox
 from jinja2 import Template
 
@@ -97 +97 @@
         if name == "istubbox.html":
             return Template("{{var}}")
-        elif name == EditableBox.TEMPLATE_NAME:
-            return template_factory.get_template(EditableBox.TEMPLATE_NAME)
+        elif name == BaseBox.TEMPLATE_NAME:
+            return template_factory.get_template(BaseBox.TEMPLATE_NAME)
         else:
             raise AssertionError