[Mpuls-commits] r1243 - in wasko/branches/2.0: . mpulsweb/lib waskaweb/config waskaweb/controllers waskaweb/lib waskaweb/model waskaweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Feb 4 13:58:48 CET 2010
Author: torsten
Date: 2010-02-04 13:58:42 +0100 (Thu, 04 Feb 2010)
New Revision: 1243
Added:
wasko/branches/2.0/mpulsweb/lib/helpers.py
Removed:
wasko/branches/2.0/waskaweb/lib/helpers.py
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/mpulsweb/lib/base.py
wasko/branches/2.0/mpulsweb/lib/security.py
wasko/branches/2.0/waskaweb/config/environment.py
wasko/branches/2.0/waskaweb/controllers/appointment.py
wasko/branches/2.0/waskaweb/controllers/caseappointment.py
wasko/branches/2.0/waskaweb/controllers/casedocument.py
wasko/branches/2.0/waskaweb/controllers/caselifetime.py
wasko/branches/2.0/waskaweb/controllers/evaluate.py
wasko/branches/2.0/waskaweb/controllers/repeatgroup.py
wasko/branches/2.0/waskaweb/lib/evaluation.py
wasko/branches/2.0/waskaweb/lib/renderer.py
wasko/branches/2.0/waskaweb/lib/template.py
wasko/branches/2.0/waskaweb/lib/xmlexport.py
wasko/branches/2.0/waskaweb/model/agencysettings.py
wasko/branches/2.0/waskaweb/model/appointment.py
wasko/branches/2.0/waskaweb/model/case.py
wasko/branches/2.0/waskaweb/model/document.py
wasko/branches/2.0/waskaweb/model/logbook.py
wasko/branches/2.0/waskaweb/model/user.py
wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako
Log:
Moved lib/helpers to base
* waskaweb/lib/helpers.py,
mpulsweb/lib/helpers.py: Moved files
* waskaweb/model/logbook.py,
waskaweb/model/appointment.py,
waskaweb/model/case.py,
waskaweb/model/document.py,
waskaweb/model/user.py,
waskaweb/model/agencysettings.py,
waskaweb/config/environment.py,
waskaweb/controllers/caselifetime.py,
waskaweb/controllers/caseappointment.py,
waskaweb/controllers/repeatgroup.py,
waskaweb/controllers/appointment.py,
waskaweb/controllers/evaluate.py,
waskaweb/controllers/casedocument.py,
waskaweb/lib/xmlexport.py,
waskaweb/lib/renderer.py,
waskaweb/lib/evaluation.py,
waskaweb/lib/template.py,
waskaweb/templates/casemanagement/caselist.mako,
mpulsweb/lib/security.py
mpulsweb/lib/base.py: Adopted imports
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/ChangeLog 2010-02-04 12:58:42 UTC (rev 1243)
@@ -1,3 +1,30 @@
+2010-02-04 Torsten Irländer <torsten.irlaender at intevation.de>
+
+ Moved lib/helpers to base
+
+ * waskaweb/lib/helpers.py,
+ mpulsweb/lib/helpers.py: Moved files
+ * waskaweb/model/logbook.py,
+ waskaweb/model/appointment.py,
+ waskaweb/model/case.py,
+ waskaweb/model/document.py,
+ waskaweb/model/user.py,
+ waskaweb/model/agencysettings.py,
+ waskaweb/config/environment.py,
+ waskaweb/controllers/caselifetime.py,
+ waskaweb/controllers/caseappointment.py,
+ waskaweb/controllers/repeatgroup.py,
+ waskaweb/controllers/appointment.py,
+ waskaweb/controllers/evaluate.py,
+ waskaweb/controllers/casedocument.py,
+ waskaweb/lib/xmlexport.py,
+ waskaweb/lib/renderer.py,
+ waskaweb/lib/evaluation.py,
+ waskaweb/lib/template.py,
+ waskaweb/templates/casemanagement/caselist.mako,
+ mpulsweb/lib/security.py
+ mpulsweb/lib/base.py: Adopted imports
+
2010-02-04 Bernhard Herzog <bh at intevation.de>
* waskaweb/model/case.py (CaseFactory._updateMasterOnCreate)
Modified: wasko/branches/2.0/mpulsweb/lib/base.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/base.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/mpulsweb/lib/base.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -43,7 +43,7 @@
import mpulsweb.lib.db as db
from mpulsweb.lib.timelog import timeLog
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
from mpulsweb.lib.security import getDbName, userIdentity
import waskaweb.model as model
Copied: wasko/branches/2.0/mpulsweb/lib/helpers.py (from rev 1241, wasko/branches/2.0/waskaweb/lib/helpers.py)
Property changes on: wasko/branches/2.0/mpulsweb/lib/helpers.py
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: wasko/branches/2.0/mpulsweb/lib/security.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/security.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/mpulsweb/lib/security.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -95,11 +95,11 @@
or not check_re.match(user)):
return None
- # imported here, because waskaweb.lib.helpers also imports
+ # imported here, because mpulsweb.lib.helpers also imports
# mpulsweb.lib.security which leads to circular imports.
# ensure_unicode shouldn't be needed here anymore anyway when the
# database returns Unicode objects directly.
- from waskaweb.lib.helpers import ensure_unicode
+ from mpulsweb.lib.helpers import ensure_unicode
log.info('Login: user "%s" in "%s"' % (user, dbname))
try:
Modified: wasko/branches/2.0/waskaweb/config/environment.py
===================================================================
--- wasko/branches/2.0/waskaweb/config/environment.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/config/environment.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -31,7 +31,7 @@
from pylons import config
import mpulsweb.lib.app_globals as app_globals
-import waskaweb.lib.helpers
+import mpulsweb.lib.helpers
from waskaweb.config.routing import make_map
log = logging.getLogger(__name__)
@@ -67,7 +67,7 @@
config['routes.map'] = make_map()
config['pylons.g'] = app_globals.Globals()
- config['pylons.h'] = waskaweb.lib.helpers
+ config['pylons.h'] = mpulsweb.lib.helpers
# Create the Mako TemplateLookup, with the default auto-escaping
config['pylons.g'].mako_lookup = TemplateLookup(
Modified: wasko/branches/2.0/waskaweb/controllers/appointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/appointment.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/controllers/appointment.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -35,7 +35,7 @@
from waskaweb.lib.base import BaseController, c, redirect_to, render, request
-from waskaweb.lib.helpers import dd_mm_YYYY, HH_MM
+from mpulsweb.lib.helpers import dd_mm_YYYY, HH_MM
from mpulsweb.lib.security import checkRole
from waskaweb.lib.validators import CreateAppointmentForm
Modified: wasko/branches/2.0/waskaweb/controllers/caseappointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/caseappointment.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/controllers/caseappointment.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -9,7 +9,7 @@
from mpulsweb.lib.security import checkRole
from waskaweb.lib.base import BaseController, render
-from waskaweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM
+from mpulsweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM
from waskaweb.lib.validators import CreateAppointmentForm
from waskaweb.model.case import CaseFactory, LoadCaseNotExistsError
from waskaweb.model.appointment import CaseAppointmentOverview, \
Modified: wasko/branches/2.0/waskaweb/controllers/casedocument.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/casedocument.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/controllers/casedocument.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -8,7 +8,7 @@
from waskaweb.lib.base import BaseController, render
from mpulsweb.lib.security import checkRole
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
from waskaweb.model.case import CaseFactory, LoadCaseNotExistsError
from waskaweb.model.document import Document, deleteDocument
Modified: wasko/branches/2.0/waskaweb/controllers/caselifetime.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/caselifetime.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/controllers/caselifetime.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -8,7 +8,7 @@
import formencode
from waskaweb.lib.base import *
-from waskaweb.lib.helpers import *
+from mpulsweb.lib.helpers import *
from waskaweb.lib.validators import \
ExtraTimeFormValidator1, ExtraTimeFormValidator2, \
ReopenFormValidator1, ReopenFormValidator1abgel, \
Modified: wasko/branches/2.0/waskaweb/controllers/evaluate.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/evaluate.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/controllers/evaluate.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -8,7 +8,7 @@
from waskaweb.lib.validators import EvaluationFormValidator
from waskaweb.lib.base import *
from mpulsweb.lib.db import db
-from waskaweb.lib.helpers import format_date, get_phasesuccessors
+from mpulsweb.lib.helpers import format_date, get_phasesuccessors
from libmpuls.evaluation.config import EvaluationConfig
from libmpuls.evaluation.evaluation import EvaluationSet
from libmpuls.evaluation.export import EvaluationExportXML, EvaluationExportCSV, EvaluationExportHTML
Modified: wasko/branches/2.0/waskaweb/controllers/repeatgroup.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/repeatgroup.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/controllers/repeatgroup.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -3,7 +3,7 @@
import formencode
from pylons import request, response, session, c
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
from pylons import g
from pylons.i18n import _
from pylons.controllers.util import abort, redirect_to
Modified: wasko/branches/2.0/waskaweb/lib/evaluation.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/evaluation.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/lib/evaluation.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -30,7 +30,7 @@
import psycopg2
-from waskaweb.lib.helpers import format_number, timedelta_in_minutes
+from mpulsweb.lib.helpers import format_number, timedelta_in_minutes
from waskaweb.lib.base import _, c, session
from mpulsweb.lib.db import db
from waskaweb.lib.sql_helper import where_ids
Deleted: wasko/branches/2.0/waskaweb/lib/helpers.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/helpers.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/lib/helpers.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -1,285 +0,0 @@
-# Copyright 2007, 2008, 2010 Intevation GmbH, Germany, <info at intevation.de>
-#
-# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
-# Web-Anwendungs-Server fuer Kompetenzagenturen).
-#
-# mpuls WASKA is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
-#
-# mpuls WASKA has been developed on behalf of the
-# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
-# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
-# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
-# European Social Fund resources.
-
-"""Helper functions
-
-Consists of functions to typically be used within templates, but also
-available to Controllers. This module is available to both as 'h'.
-"""
-
-import sys
-import locale
-import logging
-import re
-import datetime
-from string import printable
-
-from pylons import c, cache, config, g, request, response, session, url
-from pylons.i18n import _
-
-# Use url_for from prior versions
-from routes import url_for
-
-from webhelpers.html import escape, HTML, literal, url_escape
-from webhelpers.html.tags import *
-
-from mpulsweb.lib.security import hasRole, getKAName
-
-from mpulsweb.lib.navigation import get_pagename, render_navigation
-from mpulsweb.lib.helper.filters import shorten, nl_to_br
-
-
-PRINTABLE = frozenset(printable)
-
-log = logging.getLogger(__name__)
-
-
-# unicode helper
-def ensure_unicode(s):
- """Convert s to a unicode object.
- If it's alredy a unicode object, s is returned as is. Otherwise
- it's converted to a byte-string which is assumed to be in utf-8 and
- then converted to unicode."""
- if isinstance(s, unicode):
- return s
- return unicode(str(s), 'utf-8')
-
-
-# Helper functions used in the UI to show some information like status messages
-# or icons
-
-def status_message(s):
- return "%s: %s" % (format_datetime(datetime.datetime.now()), s)
-
-def get_logouttime():
- """Estimate log-out time and return it as a formatted string (HH:MM).
- The estimated logout time is two minutes before the time the session
- actually expires to make sure it's earlier.
- """
- timeout = int(config.get("beaker.session.timeout"))
- return format_time(datetime.datetime.now()
- + datetime.timedelta(seconds=timeout - 120))
-
-def getHelp(help_id):
- '''
- Returns a HTML link with a help icon if help is present for help_id. Else
- return empty string
- '''
- out = []
- help = g.helpData.getHelp(help_id)
- if help:
- out.append('<a href="/annotations/help/%s" target="_blank">' % help_id)
- out.append('<img src="/images/icons/formular/help.png" alt="help">')
- out.append('</a>')
- return "".join(out)
-
-
-# Helper functions to get some information about the logged in user
-
-def getRole():
- try:
- user = session['USER_AUTHORIZED']
- return user.getRole()
- except KeyError:
- return ''
-
-def getUserLastname():
- try:
- return session['USER_AUTHORIZED'].last_name
- except KeyError:
- return ''
-
-def getUserFullname():
- try:
- user = session['USER_AUTHORIZED']
- return "%s, %s" % (user.last_name, user.first_name)
- except KeyError:
- return ''
-
-def getLogin():
- try:
- user = session['USER_AUTHORIZED']
- return user.login
- except KeyError:
- return ''
-
-def getUserId():
- try:
- user = session['USER_AUTHORIZED']
- return user.id
- except KeyError:
- return ''
-
-# Format functions
-
-def format_number(number):
- retval = locale.format("%.2f",(number),1)
- return retval
-
-def format_date(dt):
- if dt is None:
- return ''
- try:
- return dt.strftime(locale.nl_langinfo(locale.D_FMT))
- except Exception, err:
- log.error(err)
- return dd_mm_YYYY(dt)
-
-def format_time(dt):
- if dt is None:
- return ''
- try:
- return dt.strftime(locale.nl_langinfo(locale.T_FMT))
- except Exception, err:
- log.error(err)
- return ''
-
-def format_datetime(dt):
- if dt is None:
- return ''
- try:
- return dt.strftime(locale.nl_langinfo(locale.D_T_FMT))
- except Exception, err:
- log.error(err)
- return dd_mm_yyyy_HH_MM(dt)
-
-def timedelta_in_minutes(ti):
- if ti is None:
- return None
- return round(float(ti.days * (24*60)) + ti.seconds / 60.0)
-
-def timedelta_in_weeks(ti, empty=None):
- if ti is None:
- return empty
- return format_number(float(ti.days) / 7.0 + ti.seconds / (60.0 * 24.0 * 7.0))
-
-def human_timedelta(td, empty=None):
- if td is None:
- return empty
- out = []
- if -td == abs(td):
- out.append("-")
- td = -td
- days = td.days
- if days == 1:
- out.append("1 Tag,")
- if days > 1:
- out.append("%d Tage," % days)
-
- secs = td.seconds
- hours = secs / 3600
- secs -= hours * 3600
- mins = secs / 60
- secs -= mins * 60
-
- out.append("%d:%02d:%02d" % (hours, mins, secs))
-
- return " ".join(out)
-
-
-# Fallback functions for the localized format_* functions. If localalisation
-# fails because of dates before 1900 (which aren't sensefull anyway') the
-# fallback functions are called. These functions will convert dates and time in
-# german date and time formats
-
-def dd_mm_YYYY(d, empty=''):
- """Format the date of the date/time object d as 'dd.mm.YYYY'.
- The parameter d may be a string or a datetime instance. If d is
- None, the function return the optional parameter empty (default "").
- """
- # datetime.strftime() dislikes years before 1900.
- if d is None:
- return empty
- # TODO: what should happen if d is a unicode object?
- if type(d) == str:
- try:
- y, m, d = d.split('-')
- d = datetime(y, m, d)
- except:
- return empty
- return "%02d.%02d.%d" % (d.day, d.month, d.year)
-
-def HH_MM(d):
- """Format the time object d as 'HH:MM'.
- The parameter d may be a time, datetime or date instance. If it is
- a date instance, time 00:00 is assumed. If d is None, the function
- returns the empty string.
- """
- # datetime.strftime() dislikes years before 1900.
- if d is None:
- return ''
- if type(d) is datetime.date:
- # not so smart
- d = datetime.datetime(d.year, d.month, d.day)
- return "%02d:%02d" % (d.hour, d.minute)
-
-def dd_mm_yyyy_HH_MM(d, empty = ''):
- """Format the time/date object d as 'dd.mm.YYYY HH:MM'.
- The parameter d may be a time, datetime or date instance. If it is
- a date instance, time 00:00 is assumed. If d is None, the function
- return the optional parameter empty (default"").
- """
- if d is None:
- return empty
- return dd_mm_YYYY(d) + " " + HH_MM(d)
-
-# Phases helpers. Used in evaluation
-
-# TODO: The functions are currently only used in lib.evaluation and are
-# basically a copy of those functions in model/phase_transition.py with the
-# difference that these function load phases from g.mpuls. The longterm
-# solution would be to transfer phase functionality into the libformed. So
-# these functions should be moved away from this place
-
-def get_phasesuccessors(p):
- #p = int(p)
- phasesuc = []
- pairs = g.mpuls_config.get('phases', 'pairs')[0]
- for phase, symbols in pairs.iteritems():
- if p in symbols:
- for pair in phase_successors_path(phase, None, True):
- phasesuc.extend(pairs.get(pair))
- return phasesuc
-
-def phase_successors(phase):
- try:
- suc = g.mpuls_config.get('phases', 'successors')[0][phase]
- return suc
- except KeyError:
- return []
-
-def phase_successors_path(phase, path=None, include_root=False):
- '''returns list of phase ids (not phasepairs)'''
- if not path:
- path = []
- if include_root:
- path.append(phase)
- for p in phase_successors(phase):
- path.append(p)
- phase_successors_path(p, path=path)
- return path
-
- return phasesuc
-
-# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
Modified: wasko/branches/2.0/waskaweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/renderer.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/lib/renderer.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -36,7 +36,7 @@
from formed.instance.backends.postgres import DBFactory as InstanceFactory
from mpulsweb.lib.db import PostgresDBInterface
from mpulsweb.lib.helper.filters import NA
-from waskaweb.lib.helpers import dd_mm_YYYY as format_date
+from mpulsweb.lib.helpers import dd_mm_YYYY as format_date
import formed.meta.data as data
from pylons.i18n import _
from pylons import g
Modified: wasko/branches/2.0/waskaweb/lib/template.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/template.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/lib/template.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -24,7 +24,7 @@
import pylons
from pylons.templating import Buffet
from pylons import config
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
class MyBuffet(Buffet):
def _update_names(self, ns):
Modified: wasko/branches/2.0/waskaweb/lib/xmlexport.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/xmlexport.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/lib/xmlexport.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -40,7 +40,7 @@
from pylons import g
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
#from exportselection import RG_UNTERSTUETZUNG, \
# SelectorFactory, CasePartsSelection, RG_ALL
Modified: wasko/branches/2.0/waskaweb/model/agencysettings.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/agencysettings.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/model/agencysettings.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -35,7 +35,7 @@
from mpulsweb.lib.config import get_path
from mpulsweb.lib.db import db
-from waskaweb.lib.helpers import ensure_unicode
+from mpulsweb.lib.helpers import ensure_unicode
FETCH_SETTINGS_SQL = """SELECT bez, wert from ka_konfiguration_tbl_view"""
Modified: wasko/branches/2.0/waskaweb/model/appointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/appointment.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/model/appointment.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -30,7 +30,7 @@
from datetime import datetime, timedelta
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
from waskaweb.lib.base import session
from mpulsweb.lib.db import db
from waskaweb.model.agencysettings import Agency
Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/model/case.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -45,7 +45,7 @@
from formed.meta import UNKNOWN_DATE
from waskaweb.lib.base import session, g
-from waskaweb.lib.helpers import ensure_unicode
+from mpulsweb.lib.helpers import ensure_unicode
from mpulsweb.lib.db import db, PostgresDBInterface
from waskaweb.lib.search import CaseSearch
#from waskaweb.lib.csv import exportAsCSV
Modified: wasko/branches/2.0/waskaweb/model/document.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/document.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/model/document.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -29,7 +29,7 @@
#
from mimetypes import guess_type
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
import psycopg2 as dbapi
import cStringIO as StringIO
Modified: wasko/branches/2.0/waskaweb/model/logbook.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/logbook.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/model/logbook.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -32,7 +32,7 @@
from datetime import timedelta, datetime
from mpulsweb.lib.db import db
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
from waskaweb.lib.sql_helper import range_compress
from waskaweb.model.case import CaseBundle
Modified: wasko/branches/2.0/waskaweb/model/user.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/user.py 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/model/user.py 2010-02-04 12:58:42 UTC (rev 1243)
@@ -27,7 +27,7 @@
from pylons import session
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
from mpulsweb.lib.security import getDbName
from mpulsweb.lib.db import db
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako 2010-02-04 11:55:51 UTC (rev 1242)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako 2010-02-04 12:58:42 UTC (rev 1243)
@@ -3,7 +3,7 @@
from pylons.i18n import _
import mpulsweb.lib.helper.filters as F
-import waskaweb.lib.helpers as h
+import mpulsweb.lib.helpers as h
def hide_if_anonymized(case, value):
"""
More information about the Mpuls-commits
mailing list