archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Changed URL to /attract/<project_url>/tasks/...

Browse Source 
The overall tasks index is still /attract/tasks though.
This commit is contained in:
Sybren A. Stüvel
2016-09-21 10:49:34 +02:00
parent 7b72289ddd
commit 486f947a90
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
attract/__init__.py
View File

@@ -54,7 +54,11 @@ class AttractExtension(PillarExtension):
from . import modules, tasks from . import modules, tasks
return [modules.blueprint, tasks.blueprint] return [
modules.blueprint,
tasks.blueprint,
tasks.perproject_blueprint,
]
@property @property
def template_path(self): def template_path(self):

12
attract/tasks.py
View File

@@ -11,6 +11,8 @@ from .node_types.task import node_type_task
from . import current_task_manager from . import current_task_manager
blueprint = Blueprint('attract.tasks', __name__, url_prefix='/tasks') blueprint = Blueprint('attract.tasks', __name__, url_prefix='/tasks')
perproject_blueprint = Blueprint('attract.tasks.perproject', __name__,
url_prefix='/<project_url>/tasks')
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -19,7 +21,7 @@ def index():
return render_template('attract/tasks/index.html') return render_template('attract/tasks/index.html')
@blueprint.route('/<project_url>/') @perproject_blueprint.route('/')
@attract_project_view() @attract_project_view()
def for_project(project): def for_project(project):
api = pillar_api() api = pillar_api()
@@ -35,7 +37,7 @@ def for_project(project):
project=project) project=project)
@blueprint.route('/<project_url>/<task_id>') @perproject_blueprint.route('/<task_id>')
@attract_project_view(extension_props=True) @attract_project_view(extension_props=True)
def view_embed_task(project, attract_props, task_id): def view_embed_task(project, attract_props, task_id):
api = pillar_api() api = pillar_api()
@@ -51,7 +53,7 @@ def view_embed_task(project, attract_props, task_id):
attract_props=attract_props.to_dict()) attract_props=attract_props.to_dict())
@blueprint.route('/<project_url>/<task_id>', methods=['POST']) @perproject_blueprint.route('/<task_id>', methods=['POST'])
@attract_project_view() @attract_project_view()
def save(project, task_id): def save(project, task_id):
log.info('Saving task %s', 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. # 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']) @perproject_blueprint.route('/create', methods=['POST', 'GET'])
@blueprint.route('/<project_url>/create/<task_type>', methods=['POST', 'GET']) @perproject_blueprint.route('/create/<task_type>', methods=['POST', 'GET'])
@attract_project_view() @attract_project_view()
def create_task(project, task_type=None): def create_task(project, task_type=None):
task = current_task_manager.create_task(project, task_type=task_type) task = current_task_manager.create_task(project, task_type=task_type)

2
src/templates/attract/tasks/for_project.jade
View File

@@ -44,7 +44,7 @@ script.
$('#task-list').find('a').removeClass('active'); $('#task-list').find('a').removeClass('active');
$('#task-' + task_id).addClass('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); var task_url = base_url.replace("TASKID", task_id);
$.get(task_url, function(task_data) { $.get(task_url, function(task_data) {

2
src/templates/attract/tasks/view_task_embed.jade
View File

@@ -1,6 +1,6 @@
script(src="{{ url_for('static_attract', filename='js/tasks.js') }}",async=true) script(src="{{ url_for('static_attract', filename='js/tasks.js') }}",async=true)
#task-view #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-transparent-group
input.input-transparent.task-name( input.input-transparent.task-name(
name="name", name="name",