diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt index 2445e8b..23e5db4 100644 --- a/browser/concept_macros.pt +++ b/browser/concept_macros.pt @@ -105,8 +105,10 @@ tal:condition="show_headline|python:True">Children
- +
+ @@ -124,6 +126,11 @@ t for t in (description, predicate) if t)"> +
  Title Type Modification Date
+ diff --git a/expert/browser/base.py b/expert/browser/base.py index 6a5d265..0b3b58e 100644 --- a/expert/browser/base.py +++ b/expert/browser/base.py @@ -30,7 +30,7 @@ from zope.traversing.api import getName, getParent from cybertools.browser.form import FormController from loops.browser.common import BaseView, concept_macros -from loops.browser.concept import ConceptView +from loops.browser.concept import ConceptView, ConceptRelationView from loops.browser.resource import ResourceView, ResourceRelationView from loops.common import adapted from loops import util @@ -44,7 +44,8 @@ queryTemplate = ViewPageTemplateFile('query.pt') class BaseQueryView(BaseView): template = queryTemplate - childViewFactory = ResourceRelationView + childViewFactory = ConceptRelationView + resourceViewFactory = ResourceRelationView showCheckboxes = True form_action = 'execute_query_action' @@ -77,10 +78,15 @@ class BaseQueryView(BaseView): return _(u'Selection using: $targets', mapping=dict(targets=targetNames)) - def results(self): + def resources(self): for t in self.targets: for r in t.getResourceRelations([self.defaultPredicate]): - yield self.childViewFactory(r, self.request, contextIsSecond=True) + yield self.resourceViewFactory(r, self.request, contextIsSecond=True) + + def children(self): + for t in self.targets: + for c in t.getChildRelations([self.defaultPredicate]): + yield self.childViewFactory(c, self.request, contextIsSecond=True) class ActionExecutor(FormController): @@ -92,7 +98,7 @@ class ActionExecutor(FormController): uids = form.get('selection', []) action = actions[0] if action == 'action.delete': - print '*** delete', uids + #print '*** delete', uids for uid in uids: obj = util.getObjectForUid(uid) parent = getParent(obj) diff --git a/expert/browser/query.pt b/expert/browser/query.pt index 44940dc..30462a9 100644 --- a/expert/browser/query.pt +++ b/expert/browser/query.pt @@ -1,18 +1,22 @@
+

Concepts

+ +

Resources


+ i18n:attributes="value; onclick" />
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 34d4c59..6800bf3 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 8d78f6b..2832082 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: 2011-02-10 12:00 CET\n" +"PO-Revision-Date: 2011-02-18 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -14,6 +14,9 @@ msgstr "" msgid "Concept" msgstr "Begriff" +msgid "Concepts" +msgstr "Begriffe" + msgid "Resource" msgstr "Ressource" @@ -554,6 +557,15 @@ msgstr "Kommentare" msgid "Add Comment" msgstr "Kommentar hinzufügen" +msgid "Selection using: $targets" +msgstr "Auswahl über: $targets" + +msgid "Delete objects" +msgstr "Objekte löschen" + +msgid "confirm('Do you really want to delete the selected objects?')" +msgstr "confirm('Wollen Sie die ausgewählten Objekte wirklich löschen?')" + # management interface msgid "label_type"