From 009d91ffee782046601f2671f82c075f981c7303 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 30 May 2012 15:37:21 +0200
Subject: [PATCH] define and register separate action for creating events

---
 browser/form.py                 |   6 ++++--
 locales/de/LC_MESSAGES/loops.mo | Bin 17190 -> 17234 bytes
 locales/de/LC_MESSAGES/loops.po |   7 +++++--
 organize/browser/event.py       |  28 ++++++++++++++++------------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/browser/form.py b/browser/form.py
index ce3cd2e..e7ac588 100644
--- a/browser/form.py
+++ b/browser/form.py
@@ -83,7 +83,7 @@ class ObjectForm(NodeView):
     def checkPermissions(self):
         obj = self.target
         if obj is None:
-            obj = self.context
+            obj = self.containerext
         return canWriteObject(obj)
 
     @Lazy
@@ -289,7 +289,9 @@ class CreateObjectForm(ObjectForm):
     @Lazy
     def title(self):
         if self.fixedType:
-            return _(u'Create %s') % self.typeConcept.title
+            #return _(u'Create %s') % self.typeConcept.title
+            return _(u'Create $type', 
+                     mapping=dict(type=self.typeConcept.title))
         else:
             return _(self.defaultTitle)
 
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index d8111cfefcd5567c2585d33aeb5771728415b2cc..6abb17f17598be60e78b8997f5449ac49ad7e119 100644
GIT binary patch
delta 6590
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
REyEi(*S>MnRfUHt{1^1HbsGQx

delta 6559
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
A9smFU

diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index 2a8925c..157d161 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -3,7 +3,7 @@ msgstr ""
 
 "Project-Id-Version: $Id$\n"
 "POT-Creation-Date: 2007-05-22 12:00 CET\n"
-"PO-Revision-Date: 2012-05-09 12:00 CET\n"
+"PO-Revision-Date: 2012-05-30 12:00 CET\n"
 "Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
 "Language-Team: loops developers <helmutm@cy55.de>\n"
 "MIME-Version: 1.0\n"
@@ -47,6 +47,9 @@ msgstr "Ressource anlegen..."
 msgid "Create %s"
 msgstr "%s anlegen"
 
+msgid "Create $type"
+msgstr "$type anlegen"
+
 msgid "Create a new resource object."
 msgstr "Eine neue Ressource erzeugen"
 
@@ -230,7 +233,7 @@ msgstr "Begriff bearbeiten"
 msgid "Create Event..."
 msgstr "Termin anlegen..."
 
-msgid "Create a new event"
+msgid "Create a new event."
 msgstr "Einen neuen Termin anlegen."
 
 msgid "Create Task..."
diff --git a/organize/browser/event.py b/organize/browser/event.py
index fb97b4b..17220f9 100644
--- a/organize/browser/event.py
+++ b/organize/browser/event.py
@@ -27,6 +27,7 @@ from zope import interface, component
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 
+from cybertools.browser.action import actions
 from cybertools.meta.interfaces import IOptions
 from loops.browser.action import DialogAction
 from loops.browser.concept import ConceptView
@@ -38,6 +39,17 @@ from loops.util import _
 organize_macros = ViewPageTemplateFile('view_macros.pt')
 
 
+actions.register('createEvent', 'portlet', DialogAction,
+        title=_(u'Create Event...'),
+        description=_(u'Create a new event.'),
+        viewName='create_concept.html',
+        dialogName='createEvent',
+        typeToken='.loops/concepts/event',
+        fixedType=True,
+        prerequisites=['registerDojoDateWidget'],
+)
+
+
 class Events(ConceptView):
 
     @Lazy
@@ -45,19 +57,11 @@ class Events(ConceptView):
         return organize_macros.macros['events']
 
     def getActions(self, category='object', page=None, target=None):
-        actions = []
+        acts = super(Events, self).getActions(category, page, target)
         if category == 'portlet':
-            actions.append(DialogAction(self, title=_(u'Create Event...'),
-                  description=_(u'Create a new event.'),
-                  viewName='create_concept.html',
-                  dialogName='createEvent',
-                  typeToken='.loops/concepts/event',
-                  fixedType=True,
-                  innerForm='inner_concept_form.html',
-                  page=page,
-                  target=target))
-            self.registerDojoDateWidget()
-        return actions
+            acts.extend(actions.get(category, ['createEvent'],
+                                view=self, page=page, target=target))
+        return acts
 
     @Lazy
     def selectedDate(self):