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

Remember last-visited Attract project in session

Browse Source 
This allows us to keep rendering the "Shots" and "Assets" links in the
sidebar, even when someone navigates away from the project scope.
This commit is contained in:
Sybren A. Stüvel
2017-06-16 12:02:39 +02:00
parent 59505d3233
commit 25fcfea62f
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
attract/routes.py
View File

@@ -1,7 +1,7 @@
import functools import functools
import logging import logging
from flask import Blueprint, render_template, redirect, url_for, request, jsonify from flask import Blueprint, render_template, redirect, url_for, request, jsonify, session
import flask_login import flask_login
import werkzeug.exceptions as wz_exceptions import werkzeug.exceptions as wz_exceptions
@@ -131,6 +131,8 @@ def attract_project_view(extra_project_projections: dict=None, extension_props=F
if not is_attract: if not is_attract:
return error_project_not_setup_for_attract() return error_project_not_setup_for_attract()
session['attract_last_project'] = project.to_dict()
# Check user access. # Check user access.
auth = current_attract.auth auth = current_attract.auth
auth.determine_user_rights(str2id(project['_id'])) auth.determine_user_rights(str2id(project['_id']))

15
src/templates/attract/layout.jade
View File

@@ -37,16 +37,17 @@ html(lang="en")
a.navbar-item.attract(href="{{ url_for('attract.index') }}", a.navbar-item.attract(href="{{ url_for('attract.index') }}",
title='Attract') title='Attract')
i.pi-attract i.pi-attract
| {% if project %} | {% if session.get('attract_last_project') %}
| {% set attract_last_project = session.get('attract_last_project') %}
li li
a.navbar-item.tasks(href="{{ url_for('attract.tasks.perproject.index', project_url=project.url) }}", a.navbar-item.tasks(href="{{ url_for('attract.tasks.perproject.index', project_url=attract_last_project.url) }}",
title='Tasks for project {{ project.name }}') Tasks title='Tasks for project {{ attract_last_project.name }}') Tasks
li li
a.navbar-item.shots(href="{{ url_for('attract.shots.perproject.index', project_url=project.url) }}", a.navbar-item.shots(href="{{ url_for('attract.shots.perproject.index', project_url=attract_last_project.url) }}",
title='Shots for project {{ project.name }}') Shots title='Shots for project {{ attract_last_project.name }}') Shots
li li
a.navbar-item.assets(href="{{ url_for('attract.assets.perproject.index', project_url=project.url) }}", a.navbar-item.assets(href="{{ url_for('attract.assets.perproject.index', project_url=attract_last_project.url) }}",
title='Assets for project {{ project.name }}') Assets title='Assets for project {{ attract_last_project.name }}') Assets
| {% else %} | {% else %}
| {% if current_user.is_authenticated %} | {% if current_user.is_authenticated %}
li li