From a565d750e3b5790dc4438f8cb13b9dc51316ce78 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Tue, 17 Mar 2015 08:50:53 +0100 Subject: [PATCH] don't show priority and activity if corresponding data tables do not exist; translations --- README.txt | 2 +- locales/de/LC_MESSAGES/loops.mo | Bin 25942 -> 26265 bytes locales/de/LC_MESSAGES/loops.po | 23 ++++++++++++++++++++++- organize/work/browser.py | 14 ++++++++++---- organize/work/work_macros.pt | 17 +++++++++-------- table.py | 3 +-- 6 files changed, 43 insertions(+), 16 deletions(-) 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 df8afd747c7f0c1ec989f7ee6b9d21c84e029d75..8067eef3cf1a1af1c730a4a8073b8781270d3692 100644 GIT binary patch delta 9647 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 OYFbuw-lD-D`~44G@)?W( delta 9357 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 tpsaa5p3\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"> - - - -
+ +
+ +