Changeset 911

Show
Ignore:
Timestamp:
03/10/10 11:51:45 (5 months ago)
Author:
ltucker
Message:

improve url consistency on fix for bug #374, maps/[mapid]/delete => maps/mapid?remove like data/[layername]?remove

Location:
GeoNode/trunk/src/GeoNodePy/geonode
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • GeoNode/trunk/src/GeoNodePy/geonode/maps/urls.py

    r910 r911  
    88    (r'^$', 'maps'), 
    99    (r'^new$', 'newmap'), 
    10     (r'^(?P<mapid>\d+)$', 'mapdetail'), 
     10    (r'^(?P<mapid>\d+)$', 'map_controller'), 
    1111    (r'^(?P<mapid>\d+)/view$', 'view'), 
    1212    (r'^embed/$', 'embed'), 
    1313    (r'^(?P<mapid>\d+)/embed$', 'embed'), 
    1414        (r'^(?P<mapid>\d+)/data$', 'mapJSON'), 
    15         (r'^(?P<mapid>\d+)/delete$', 'deletemap'), 
    16     # map information page 
    17     (r'^detail/(?P<mapid>\d+)$', 'mapdetail'), 
    18     
    1915) 

  • GeoNode/trunk/src/GeoNodePy/geonode/maps/views.py

    r910 r911  
    149149    })) 
    150150 
     151def map_controller(request, mapid): 
     152    ''' 
     153    main view for map resources, dispatches to correct  
     154    view based on method and query args.  
     155    ''' 
     156    if 'remove' in request.GET:  
     157        return deletemap(request, mapid) 
     158    else: 
     159        return mapdetail(request, mapid) 
    151160 
    152161def view(request, mapid): 
    … …  
    162171        'GEOSERVER_BASE_URL' : settings.GEOSERVER_BASE_URL 
    163172    })) 
    164  
    165173 
    166174def embed(request, mapid=None): 

  • GeoNode/trunk/src/GeoNodePy/geonode/settings.py

    r908 r911  
    22from utils import path_extrapolate 
    33from urllib import urlencode 
     4import os 
    45 
    56_ = lambda x: x 
    … …  
    1516MANAGERS = ADMINS 
    1617 
     18# '../' relative to this file 
     19PROJECT_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) 
     20 
    1721DATABASE_ENGINE = 'sqlite3' 
    18 DATABASE_NAME = 'development.db' 
     22DATABASE_NAME = os.path.join(PROJECT_ROOT, 'development.db') 
    1923DATABASE_USER = ''             # Not used with sqlite3. 
    2024DATABASE_PASSWORD = ''         # Not used with sqlite3. 

  • GeoNode/trunk/src/GeoNodePy/geonode/templates/maps/mapinfo.html

    r910 r911  
    3232        <ul> 
    3333            <li><a href="{% url geonode.maps.views.view map.id %}">Edit map or metadata</a></li>  
    34             <li><a href="{% url geonode.maps.views.deletemap map.id %}">Delete map</a></li> 
     34            <li><a href="{% url geonode.maps.views.map_controller map.id %}?remove">Delete map</a></li> 
    3535            <li><a href="{% url geonode.maps.views.newmap %}?copy={{map.id}}">Duplicate map</a></li> 
    3636         </ul>