Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Did preliminary implementation of new workflow

  • Loading branch information...
commit ef1007a7d20ff7b34e781282710a586595d5580a 1 parent dd47802
@jrasky jrasky authored
View
2  geocamTiePoint/static/geocamTiePoint/js/backbone/views.js
@@ -512,7 +512,7 @@ $(function($) {
});
var csrftoken = app.views.NewOverlayView.prototype.getCookie('csrftoken');
$.ajax({
- url: '/overlays/new.html',
+ url: '/old/overlays/new.html',
crossDomain: false,
beforeSend: function(xhr, settings) {
if (!app.views.NewOverlayView.prototype.csrfSafeMethod(settings.type)) {
View
19 geocamTiePoint/urls.py
@@ -5,17 +5,30 @@
# __END_LICENSE__
from django.conf.urls.defaults import url, patterns
+from django.shortcuts import redirect
+from django.core.urlresolvers import reverse
urlpatterns = patterns(
'geocamTiePoint.views',
- ## Old Client ##
- url(r'^overlays/list.html$', 'overlayIndex',
+ ## New Workflow ##
+ url(r'^overlays/', 'backbone',
+ {}, 'geocamTiePoint_backbone_overlays'),
+
+ ## Urls to make current pages work with new workflow ##
+ url(r'^overlays/list.html$', lambda request: redirect('geocamTiePoint_backbone_overlays'),
{}, 'geocamTiePoint_overlayIndex'),
- url(r'^overlays/new.html$', 'overlayNew',
+ url(r'^overlays/new.html$', lambda request: redirect(reverse('geocamTiePoint_backbone_overlays')+'#overlays/new'),
{}, 'geocamTiePoint_overlayNew'),
+ ## Old Client ##
+ url(r'^old/overlays/list.html$', 'overlayIndex',
+ {}, 'geocamTiePoint_overlayIndex_old'),
+
+ url(r'^old/overlays/new.html$', 'overlayNew',
+ {}, 'geocamTiePoint_overlayNew_old'),
+
url(r'^overlay/(?P<key>\d+).html$', 'overlayId',
{}, 'geocamTiePoint_overlayId'),
Please sign in to comment.
Something went wrong with that request. Please try again.