Changeset 197f1fe in osmose-frontend


Ignore:
Timestamp:
Feb 16, 2014 7:25:42 PM (6 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
2113729
Parents:
034ae3f
git-author:
Jocelyn Jaubert <jocelyn.jaubert@…> (01/12/2013 21:51:53)
git-committer:
Jocelyn Jaubert <jocelyn.jaubert@…> (16/02/2014 19:25:42)
Message:

Add link to information page for false_positives

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • errors.py

    r1282d45 r197f1fe  
    115115    else: 
    116116        title = _("Informations") 
    117         gen = "info" 
     117        gen = "error" 
    118118 
    119119    countries = query_meta._countries(db, lang) 
     
    121121 
    122122    params = query._params() 
    123     params.status = {"info":"open", "false-positive": "false", "done":"done"}[gen] 
     123    params.status = {"error":"open", "false-positive": "false", "done":"done"}[gen] 
    124124    params.limit = None 
    125125 
  • tools/query.py

    r1680e4b r197f1fe  
    9191    if country: 
    9292        tables.append("dynpoi_source") 
    93     if not stats and not status in ("done", "false"): 
     93    if not stats: 
    9494        tables.append("dynpoi_item") 
    9595        if useDevItem: 
     
    213213def _gets(db, params): 
    214214    sqlbase = """ 
    215     SELECT""" 
     215    SELECT 
     216        marker.id AS id,""" 
    216217    if not params.status in ("done", "false"): 
    217218        sqlbase += """ 
    218         marker.id, 
    219219        marker.item,""" 
    220220    elif params.full: 
    221221        sqlbase += """ 
    222         -1 AS id, 
    223222        dynpoi_class.item,""" 
    224223    else: 
    225224        sqlbase += """ 
    226         -1 AS id, 
    227         -1 AS item,""" 
     225        dynpoi_class.item,""" 
    228226    sqlbase += """ 
    229227        marker.lat, 
     
    239237        dynpoi_class.title, 
    240238        dynpoi_class.level, 
    241         dynpoi_update_last.timestamp""" 
     239        dynpoi_update_last.timestamp, 
     240        dynpoi_item.menu""" 
    242241        if not params.status in ("done", "false"): 
    243242            sqlbase += """, 
    244         dynpoi_item.menu, 
    245243        marker_elem.username, 
    246244        -1 AS date""" 
    247245        else: 
    248246            sqlbase += """, 
    249         '' AS menu, 
    250247        '' AS username, 
    251248        marker.date""" 
  • views/errors/list.tpl

    r34ea91d r197f1fe  
    1313    <th>#</th> 
    1414    <th>{{_("item")}}</th> 
    15 %if gen == "info": 
    1615    <th title="{{_("information on error")}}">E</th> 
    17 %end 
    1816    <th title="{{_("position")}}">{{_("position (abbreviation)")}}</th> 
    1917    <th>{{_("elements (abbreviation)")}}</th> 
     
    3735    <td></td> 
    3836%    end 
    39 %    if gen == "info": 
    40     <td title="erreur n°{{res["id"]}}"><a href="../error/{{res["id"]}}">E</a></td> 
    41 %    end 
     37    <td title="erreur n°{{res["id"]}}"><a href="../{{gen}}/{{res["id"]}}">E</a></td> 
    4238%    if res["lat"] and res["lon"]: 
    4339%        lat = res["lat"] 
Note: See TracChangeset for help on using the changeset viewer.