diff --git a/README.txt b/README.txt index bbffa03..9da5ed7 100755 --- a/README.txt +++ b/README.txt @@ -913,7 +913,7 @@ relates ISO country codes with the full name of the country. >>> sorted(adapted(concepts['countries']).data.items()) [('at', ['Austria']), ('de', ['Germany'])] - >>> countries.dataAsRecords + >>> countries.dataAsRecords() [{'value': 'Austria', 'key': 'at'}, {'value': 'Germany', 'key': 'de'}] >>> countries.getRowsByValue('value', 'Germany') diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index df8afd7..8067eef 100644 Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 0b357ea..fea27fa 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: 0.13.1\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2015-03-13 12:00 CET\n" +"PO-Revision-Date: 2015-03-17 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -1009,6 +1009,21 @@ msgstr "Kalender" msgid "Work Items" msgstr "Aktivitäten" +msgid "Work Item Type" +msgstr "Art der Aktivität" + +msgid "Unit of Work" +msgstr "Standard-Aktivität" + +msgid "Scheduled Event" +msgstr "Termin" + +msgid "Deadline" +msgstr "Deadline" + +msgid "Check-up" +msgstr "Überprüfung" + msgid "Work Items for $title" msgstr "Aktivitäten für $title" @@ -1039,6 +1054,12 @@ msgstr "Dauer/Aufwand" msgid "Duration / Effort (hh:mm)" msgstr "Dauer / Aufwand (hh:mm)" +msgid "Priority" +msgstr "Priorität" + +msgid "Activity" +msgstr "Tätigkeit" + msgid "Action" msgstr "Aktion" diff --git a/organize/work/browser.py b/organize/work/browser.py index ca8d058..b5270b3 100644 --- a/organize/work/browser.py +++ b/organize/work/browser.py @@ -549,13 +549,19 @@ class CreateWorkItemForm(ObjectForm, BaseTrackView): @Lazy def priorities(self): - prio = self.conceptManager.get('organize.work.priorities') - return prio and adapted(prio).dataAsRecords or [] + if 'priority' in self.workItemType.fields: + prio = self.conceptManager.get('organize.work.priorities') + if prio: + return adapted(prio).dataAsRecords() + return [] @Lazy def activities(self): - act = self.conceptManager.get('organize.work.activities') - return act and adapted(act).dataAsRecords or [] + if 'activity' in self.workItemType.fields: + act = self.conceptManager.get('organize.work.activities') + if act: + return adapted(act).dataAsRecords() + return [] @Lazy def duration(self): diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt index abc9682..7120d08 100644 --- a/organize/work/work_macros.pt +++ b/organize/work/work_macros.pt @@ -163,29 +163,30 @@ tal:attributes="value view/deadlineTime" />
+ tal:define="priorities view/priorities; + activities view/activities" + tal:condition="python:priorities or activities"> - - - -
+ +
+ +