cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backport changes from bbmaster2

Browse source
This commit is contained in:
Helmut Merz 2016-02-04 15:07:20 +01:00
parent f69a43699c
commit 2e096a3682
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
browser/node.py
View file

@ -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 # 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 # 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 is not None:
if tv.isToplevel: if tv.isToplevel:
return tv(*args, **kw) return tv(*args, **kw)
if self.controller is not None:
self.controller.setMainPage()
return super(NodeView, self).__call__(*args, **kw) return super(NodeView, self).__call__(*args, **kw)
@Lazy @Lazy
def macro(self): def macro(self):
return self.template.macros['content'] 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): def update(self):
result = super(NodeView, self).update() result = super(NodeView, self).update()
self.recordAccess() self.recordAccess()

BIN
locales/de/LC_MESSAGES/loops.mo
View file

Binary file not shown.

5
locales/de/LC_MESSAGES/loops.po
View file

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: 0.13.0\n" "Project-Id-Version: 0.13.0\n"
"POT-Creation-Date: 2007-05-22 12:00 CET\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 <helmutm@cy55.de>\n" "Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
"Language-Team: loops developers <helmutm@cy55.de>\n" "Language-Team: loops developers <helmutm@cy55.de>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -813,6 +813,9 @@ msgstr "Ihr Benutzerkonto wurde eingerichtet."
msgid "Your password has been changed." msgid "Your password has been changed."
msgstr "Ihr Passwort wurde geändert." msgstr "Ihr Passwort wurde geändert."
msgid "message_password_changed"
msgstr "Ihr Passwort wurde geändert."
msgid "Date/Time" msgid "Date/Time"
msgstr "Datum/Uhrzeit" msgstr "Datum/Uhrzeit"