From 2e096a368228d5903724e16ebef28df04be8e389 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Thu, 4 Feb 2016 15:07:20 +0100 Subject: [PATCH] backport changes from bbmaster2 --- browser/node.py | 17 ++++++++++++++++- locales/de/LC_MESSAGES/loops.mo | Bin 25166 -> 25237 bytes locales/de/LC_MESSAGES/loops.po | 5 ++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/browser/node.py b/browser/node.py index 87c591c..c23ab27 100755 --- a/browser/node.py +++ b/browser/node.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Helmut Merz helmutm@cy55.de +# Copyright (c) 2016 Helmut Merz helmutm@cy55.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,12 +91,27 @@ class NodeView(BaseView): if tv is not None: if tv.isToplevel: return tv(*args, **kw) + if self.controller is not None: + self.controller.setMainPage() return super(NodeView, self).__call__(*args, **kw) @Lazy def macro(self): return self.template.macros['content'] + @Lazy + def subparts(self): + def getParts(n): + t = n.targetObjectView + if t is None: + return [] + return t.subparts + parts = getParts(self) + #return parts + for n in self.textItems: + parts.extend(getParts(n)) + return parts + def update(self): result = super(NodeView, self).update() self.recordAccess() diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index e8b16d3313e0f9fd7d5253bcb3682cac003859cf..a15304664ef622d46a0cba17b97ee0eec4f52a08 100644 GIT binary patch delta 7240 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 Lucqe(o$CD`wHG{9 delta 7196 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 bpP9P7%et4B^(^1=ZspI5w_JZ^+gkqzqogl< diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 7d440da..b3abae7 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.0\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2015-10-30 12:00 CET\n" +"PO-Revision-Date: 2016-01-27 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -813,6 +813,9 @@ msgstr "Ihr Benutzerkonto wurde eingerichtet." msgid "Your password has been changed." msgstr "Ihr Passwort wurde geändert." +msgid "message_password_changed" +msgstr "Ihr Passwort wurde geändert." + msgid "Date/Time" msgstr "Datum/Uhrzeit"