Now the new table wrsledruncache version 1.4 is used.

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

diff --git a/wradmin/setup.py b/wradmin/setup.py
index 61de7b063fb7e5c321523c1239cbe953f214794f..6d0afef3dd2a5c3b601d4658b15bf677b0b4ca6a 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.1',
+    version='1.4.2',

     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 8f571a08ef4c5b96f00fe085e27930083808860c..4cc8a06ce5fafd5766181724dffc2b7d8fe17126 100644 (file)
--- a/wradmin/wradmin/controllers/rodelbahn.py
+++ b/wradmin/wradmin/controllers/rodelbahn.py
@@ -46,7 +46,7 @@ class RodelbahnController(BaseController):
     
     def update(self):
         "Updates the wrsledruncache table from the wiki"
     
     def update(self):
         "Updates the wrsledruncache table from the wiki"

-        from wradmin.model import page_table as page, wrsleddingcache_table1_3 as wrsledruncache, categorylinks_table as categorylinks, revision_table as revision, text_table as text
+        from wradmin.model import page_table as page, wrsledruncache_table as wrsledruncache, categorylinks_table as categorylinks, revision_table as revision, text_table as text

         from sqlalchemy.sql import select
         c = model.meta.Session.connection()
         
         from sqlalchemy.sql import select
         c = model.meta.Session.connection()
         

diff --git a/wradmin/wradmin/model/__init__.py b/wradmin/wradmin/model/__init__.py
index 2cf9f5f0758d3ebec9d2a04f2db880744799b5fa..936dbc9d2ca547ec3d702ebb55c5196f7e8a85ae 100644 (file)
--- a/wradmin/wradmin/model/__init__.py
+++ b/wradmin/wradmin/model/__init__.py
@@ -62,8 +62,7 @@ wrsleddingcache_table1_2 =  sa.Table("wrsleddingcache1_2", meta.metadata,
 
 # Old table definition
 # - version 1.3 (changes made from version 1.2)
 
 # Old table definition
 # - version 1.3 (changes made from version 1.2)

-# wrsleddingcache_table1_3 =  sa.Table("wrsleddingcache1_3", meta.metadata,
-wrsleddingcache_table1_3 =  sa.Table("wrsleddingcache", meta.metadata,
+wrsleddingcache_table1_3 =  sa.Table("wrsleddingcache1_3", meta.metadata,

     sa.Column("page_id", types.Integer, primary_key=True),
     sa.Column("page_title", types.Unicode(255)),
     sa.Column("position_latitude", types.Float),
     sa.Column("page_id", types.Integer, primary_key=True),
     sa.Column("page_title", types.Unicode(255)),
     sa.Column("position_latitude", types.Float),


@@ -260,6 +259,6 @@ class Page(object):
 orm.mapper(WrReport, wrreport_table)
 # We could add a relation but we don't need it yet:
 # orm.mapper(WrSledrunCache, wrsledruncache_table, properties = {'reports': orm.relation(WrReport, backref='sledding')})
 orm.mapper(WrReport, wrreport_table)
 # We could add a relation but we don't need it yet:
 # orm.mapper(WrSledrunCache, wrsledruncache_table, properties = {'reports': orm.relation(WrReport, backref='sledding')})

-orm.mapper(WrSledrunCache, wrsleddingcache_table1_3) # TODO: Change to wrsledruncache_table
+orm.mapper(WrSledrunCache, wrsledruncache_table)

 orm.mapper(WrInnCache, wrinncache_table)
 
 orm.mapper(WrInnCache, wrinncache_table)
 

diff --git a/wradmin/wradmin/templates/rodelbahn_list.html b/wradmin/wradmin/templates/rodelbahn_list.html
index 51f6147044e797c0b363c6acd55b5494b6f5f9f6..864fe620a37069bc2d920714057e8baeceac8bc4 100644 (file)
--- a/wradmin/wradmin/templates/rodelbahn_list.html
+++ b/wradmin/wradmin/templates/rodelbahn_list.html
@@ -27,6 +27,7 @@
         <th>Gehzeit</th>
         <th>Höhe (oben)</th>
         <th>Höhe (unten)</th>
         <th>Gehzeit</th>
         <th>Höhe (oben)</th>
         <th>Höhe (unten)</th>

+        <th>Aufstieg möglich</th>

         <th>Aufstieg getrennt</th>
         <th>Lift</th>
         <th>Licht</th>
         <th>Aufstieg getrennt</th>
         <th>Lift</th>
         <th>Licht</th>


@@ -47,6 +48,7 @@
         <td>${s.walkup_time}</td>
         <td>${s.top_elevation}</td>
         <td>${s.bottom_elevation}</td>
         <td>${s.walkup_time}</td>
         <td>${s.top_elevation}</td>
         <td>${s.bottom_elevation}</td>

+        <td>${h.bool(s.walkup_possible)}</td>

         <td>${h.tristate_float(s.walkup_separate)}</td>
         <td>${h.bool(s.lift)}</td>
         <td>${h.tristate_float(s.night_light)}</td>
         <td>${h.tristate_float(s.walkup_separate)}</td>
         <td>${h.bool(s.lift)}</td>
         <td>${h.tristate_float(s.night_light)}</td>

diff --git a/wradmin/wradmin/templates/rodelbahn_view.html b/wradmin/wradmin/templates/rodelbahn_view.html
index 55b7fb7bcd9ba83fe71a287893acd4e66f676c4c..c7f585691ef6708972e981a7727df913703021c9 100644 (file)
--- a/wradmin/wradmin/templates/rodelbahn_view.html
+++ b/wradmin/wradmin/templates/rodelbahn_view.html
@@ -39,6 +39,10 @@
         <th>Höhe (unten)</th>
         <td>${c.sledding.bottom_elevation}</td>
     </tr>
         <th>Höhe (unten)</th>
         <td>${c.sledding.bottom_elevation}</td>
     </tr>

+    <tr>
+        <th>Aufstieg möglich</th>
+        <td>${h.bool(c.sledding.walkup_possible)}</td>
+    </tr>

     <tr>
         <th>Aufstieg getrennt</th>
         <td>${h.tristate_float(c.sledding.walkup_separate)}</td>
     <tr>
         <th>Aufstieg getrennt</th>
         <td>${h.tristate_float(c.sledding.walkup_separate)}</td>