From 486f947a909dac03a331d328757c4b0047f8d76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Wed, 21 Sep 2016 10:49:34 +0200
Subject: [PATCH] Changed URL to /attract/<project_url>/tasks/...

The overall tasks index is still /attract/tasks though.
---
 attract/__init__.py                              |  6 +++++-
 attract/tasks.py                                 | 12 +++++++-----
 src/templates/attract/tasks/for_project.jade     |  2 +-
 src/templates/attract/tasks/view_task_embed.jade |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/attract/__init__.py b/attract/__init__.py
index b89582c..12388f4 100644
--- a/attract/__init__.py
+++ b/attract/__init__.py
@@ -54,7 +54,11 @@ class AttractExtension(PillarExtension):
 
         from . import modules, tasks
 
-        return [modules.blueprint, tasks.blueprint]
+        return [
+            modules.blueprint,
+            tasks.blueprint,
+            tasks.perproject_blueprint,
+        ]
 
     @property
     def template_path(self):
diff --git a/attract/tasks.py b/attract/tasks.py
index 60e7298..9c64c33 100644
--- a/attract/tasks.py
+++ b/attract/tasks.py
@@ -11,6 +11,8 @@ from .node_types.task import node_type_task
 from . import current_task_manager
 
 blueprint = Blueprint('attract.tasks', __name__, url_prefix='/tasks')
+perproject_blueprint = Blueprint('attract.tasks.perproject', __name__,
+                                 url_prefix='/<project_url>/tasks')
 log = logging.getLogger(__name__)
 
 
@@ -19,7 +21,7 @@ def index():
     return render_template('attract/tasks/index.html')
 
 
-@blueprint.route('/<project_url>/')
+@perproject_blueprint.route('/')
 @attract_project_view()
 def for_project(project):
     api = pillar_api()
@@ -35,7 +37,7 @@ def for_project(project):
                            project=project)
 
 
-@blueprint.route('/<project_url>/<task_id>')
+@perproject_blueprint.route('/<task_id>')
 @attract_project_view(extension_props=True)
 def view_embed_task(project, attract_props, task_id):
     api = pillar_api()
@@ -51,7 +53,7 @@ def view_embed_task(project, attract_props, task_id):
                            attract_props=attract_props.to_dict())
 
 
-@blueprint.route('/<project_url>/<task_id>', methods=['POST'])
+@perproject_blueprint.route('/<task_id>', methods=['POST'])
 @attract_project_view()
 def save(project, task_id):
     log.info('Saving task %s', task_id)
@@ -63,8 +65,8 @@ def save(project, task_id):
 
 
 # TODO: remove GET method once Pablo has made a proper button to call this URL with a POST.
-@blueprint.route('/<project_url>/create', methods=['POST', 'GET'])
-@blueprint.route('/<project_url>/create/<task_type>', methods=['POST', 'GET'])
+@perproject_blueprint.route('/create', methods=['POST', 'GET'])
+@perproject_blueprint.route('/create/<task_type>', methods=['POST', 'GET'])
 @attract_project_view()
 def create_task(project, task_type=None):
     task = current_task_manager.create_task(project, task_type=task_type)
diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade
index 7f6150e..42dfba7 100644
--- a/src/templates/attract/tasks/for_project.jade
+++ b/src/templates/attract/tasks/for_project.jade
@@ -44,7 +44,7 @@ script.
 		$('#task-list').find('a').removeClass('active');
 		$('#task-' + task_id).addClass('active');
 
-		var base_url = "{{ url_for('attract.tasks.view_embed_task', project_url=project.url, task_id='TASKID') }}";
+		var base_url = "{{ url_for('attract.tasks.perproject.view_embed_task', project_url=project.url, task_id='TASKID') }}";
 		var task_url = base_url.replace("TASKID", task_id);
 
 		$.get(task_url, function(task_data) {
diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade
index df2f06a..5195537 100644
--- a/src/templates/attract/tasks/view_task_embed.jade
+++ b/src/templates/attract/tasks/view_task_embed.jade
@@ -1,6 +1,6 @@
 script(src="{{ url_for('static_attract', filename='js/tasks.js') }}",async=true)
 #task-view
-	form(onsubmit="return save_task('{{task._id}}', '{{ url_for('attract.tasks.save', project_url=project['url'], task_id=task._id) }}')")
+	form(onsubmit="return save_task('{{task._id}}', '{{ url_for('attract.tasks.perproject.save', project_url=project['url'], task_id=task._id) }}')")
 		.input-transparent-group
 			input.input-transparent.task-name(
 				name="name",