entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

revert r1023 (broke au quotidien)

This commit is contained in:
Frédéric Péters 2007-06-17 21:20:12 +00:00
parent 8040420616
commit 8da9b99bb7
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wcs/qommon/publisher.py
View File

@ -13,7 +13,7 @@ import locale
from quixote.publish import Publisher, get_response, get_publisher, get_session
from qommon import errors
import errors
import template
import logger
@ -64,25 +64,13 @@ class QommonPublisher(Publisher):
error_title = _('Internal Server Error'),
exception = result)
def _get_user_name(self):
session = get_session()
if session and session.user and not str(session.user).startswith(str('anonymous-')) \
and self.user_class is not None:
try:
user = self.user_class.get(session.user)
except (KeyError, ValueError):
return None
else:
return user.name
return None
def filter_output(self, request, output):
response = get_response()
if response.content_type != 'text/html':
return output
if not hasattr(response, 'filter') or not response.filter:
return output
return template.decorate(output, response, self._get_user_name())
return template.decorate(output, response)
def install_lang(self, lang = None):
if lang is None or not self.translations.has_key(lang):
@ -110,11 +98,8 @@ class QommonPublisher(Publisher):
if not os.path.exists(self.app_dir):
os.mkdir(self.app_dir)
def try_publish(self, request, app_dir=None):
if app_dir is not None:
self.app_dir = app_dir
else:
self.set_app_dir(request)
def try_publish(self, request):
self.set_app_dir(request)
self.set_config()
lang = self.cfg.get('language', {}).get('language', None)

27
wcs/qommon/template.ptl
View File

@ -107,7 +107,7 @@ def get_default_ezt_template():
return DEFAULT_TEMPLATE_EZT
def decorate(body, response, user_name=None, org_name=None, web_root=''):
def decorate(body, response):
from publisher import get_cfg
body = str(body)
kwargs = {}
@ -118,8 +118,7 @@ def decorate(body, response, user_name=None, org_name=None, web_root=''):
response.filter['lang'] = get_request().language
onload = kwargs.get('onload')
if org_name is None:
org_name = get_cfg('sp', {}).get('organization_name',
org_name = get_cfg('sp', {}).get('organization_name',
kwargs.get('default_org', get_publisher().APP_NAME))
site_name = get_cfg('misc', {}).get('sitename', org_name)
current_theme = get_cfg('branding', {}).get('theme', 'default')
@ -134,25 +133,37 @@ def decorate(body, response, user_name=None, org_name=None, web_root=''):
title_or_orgname = site_name
script = kwargs.get('script') or ''
try:
user = get_request().user
except:
user = None
if response.filter.get('admin_ezt'):
header_menu = kwargs.get('header_menu')
user_info = kwargs.get('user_info')
page_title = kwargs.get('sitetitle') + kwargs.get('title', '')
subtitle = kwargs.get('subtitle')
css = get_request().environ['SCRIPT_NAME'] + web_root + '/css/dc2/admin.css'
css = get_request().environ['SCRIPT_NAME'] + '/css/dc2/admin.css'
script = kwargs.get('scripts')
generate_breadcrumb = True
template = admin_template
else:
if current_theme == 'default':
css = get_request().environ['SCRIPT_NAME'] + web_root + '/css/%s.css' % get_publisher().APP_NAME
css = get_request().environ['SCRIPT_NAME'] + '/css/%s.css' % get_publisher().APP_NAME
else:
css = get_request().environ['SCRIPT_NAME'] + web_root + '/themes/%s/%s.css' % (current_theme, get_publisher().APP_NAME)
css = get_request().environ['SCRIPT_NAME'] + '/themes/%s/%s.css' % (current_theme, get_publisher().APP_NAME)
prelude = ''
if include_user and not kwargs.get('force_ignore_user'):
if user_name is not None:
prelude = '<p id="prelude">%s</p>' % (_('Logged in as %s.') % user_name)
session = get_session()
if session and session.user and not str(session.user).startswith(str('anonymous-')):
try:
user = get_publisher().user_class.get(session.user)
except (KeyError, ValueError):
pass
else:
prelude = '<p id="prelude">%s</p>' % (_('Logged in as %s.') % user.name)
template_ezt = get_cfg('branding', {}).get('template')