Renamed mwwrdb to wrmwdb.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/wradmin@776 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wradmin/setup.py b/wradmin/setup.py
index 8c53ab04f34508114a9dbe441310a11a29905a6f..fe2cfb5f0eb5d886f6d279bac9e887911a5c1f0a 100644 (file)
--- a/wradmin/setup.py
+++ b/wradmin/setup.py
@@ -7,7 +7,7 @@ except ImportError:
 
 setup(
     name='wradmin',
 
 setup(
     name='wradmin',

-    version='1.4.3',
+    version='1.4.4',

     description='Administrative Interface for Winterrodeln',
     author='Philipp Spitzer',
     author_email='philipp.spitzer@winterrodeln.org',
     description='Administrative Interface for Winterrodeln',
     author='Philipp Spitzer',
     author_email='philipp.spitzer@winterrodeln.org',

diff --git a/wradmin/wradmin/controllers/rodelbahn.py b/wradmin/wradmin/controllers/rodelbahn.py
index 4cc8a06ce5fafd5766181724dffc2b7d8fe17126..106751e52886f9131f00d230ba290f0745abbb50 100644 (file)
--- a/wradmin/wradmin/controllers/rodelbahn.py
+++ b/wradmin/wradmin/controllers/rodelbahn.py
@@ -26,7 +26,7 @@ class RodelbahnController(BaseController):
 
 
     def list(self):
 
 
     def list(self):

-        "Lists all sledding routes"
+        "Lists all sled runs"

         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
         c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
         c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)


@@ -34,7 +34,7 @@ class RodelbahnController(BaseController):
     
     
     def view(self, id):
     
     
     def view(self, id):

-        "Displays a sledding route"
+        "Displays a sled run"

         q = model.meta.Session.query(model.WrSledrunCache)
         c.sledding =  q.get(id)
         if c.sledding is None: abort(404)
         q = model.meta.Session.query(model.WrSledrunCache)
         c.sledding =  q.get(id)
         if c.sledding is None: abort(404)

diff --git a/wradmin/wradmin/model/__init__.py b/wradmin/wradmin/model/__init__.py
index 813d26e8e659ec1832fd92444835e1ddfed28438..e38529446bea11bfaa8be3c36dc7c36dc75bee03 100644 (file)
--- a/wradmin/wradmin/model/__init__.py
+++ b/wradmin/wradmin/model/__init__.py
@@ -2,7 +2,7 @@
 import datetime
 from sqlalchemy import orm
 from wradmin.model import meta
 import datetime
 from sqlalchemy import orm
 from wradmin.model import meta

-from wrpylib import mwdb, mwwrdb
+from wrpylib import mwdb, wrmwdb

 
 
 def init_model(engine):
 
 
 def init_model(engine):


@@ -11,9 +11,9 @@ def init_model(engine):
     meta.engine = engine
 
 
     meta.engine = engine
 
 

-wrreport_table = mwwrdb.wrreport_table(meta.metadata)
-wrsledruncache_table = mwwrdb.wrsledruncache_table(meta.metadata)
-wrinncache_table = mwwrdb.wrinncache_table(meta.metadata)
+wrreport_table = wrmwdb.wrreport_table(meta.metadata)
+wrsledruncache_table = wrmwdb.wrsledruncache_table(meta.metadata)
+wrinncache_table = wrmwdb.wrinncache_table(meta.metadata)

 page_table = mwdb.page_table(meta.metadata)
 revision_table = mwdb.revision_table(meta.metadata)
 text_table = mwdb.text_table(meta.metadata)
 page_table = mwdb.page_table(meta.metadata)
 revision_table = mwdb.revision_table(meta.metadata)
 text_table = mwdb.text_table(meta.metadata)