Commit Graph

187 Commits

Author SHA1 Message Date
25fcfea62f Remember last-visited Attract project in session
This allows us to keep rendering the "Shots" and "Assets" links in the
sidebar, even when someone navigates away from the project scope.
2017-06-16 12:02:39 +02:00
59505d3233 Fixed Attract link not showing up in sidebar 2017-06-16 11:55:30 +02:00
c69aeb03dc Hide Attract links & project settings for non-attract-users 2017-06-15 16:26:17 +02:00
50ae411575 Only users with attract-user role can use Attract
Subscribers without that role still have read-only access to Attract,
assuming they have access to the project at all.

NOTE: this only handles the web interface. API calls are still governed
by the nodes permission system, which doesn't currently allow these kinds
of role-based user checks.
2017-06-15 12:50:28 +02:00
f4a06c3271 Declare user roles introduced by Attract 2017-06-15 11:32:05 +02:00
bf9a73ff00 Fixed project property loss when setting up for Attract
This was caused by attract_project_view() not passing the full project to
the decorated function. Now you can pass full_project=True to avoid
projections at all, and get the full thing.
2017-06-15 11:07:27 +02:00
9ea75c30e3 Added project settings allowing setup + editing task types.
- Attract added to Project Settings screen
- setting up project for Attract
- editing shot/asset task types

To do: add checks that the user is allowed to use Attract in the first
place.
2017-06-15 11:07:27 +02:00
725f93175c Added Attract project sidebar 2017-06-15 11:07:14 +02:00
9d59aefd80 Upgrade jquery-resizable to 0.20
https://github.com/RickStrahl/jquery-resizable
2017-06-14 18:27:16 +02:00
f05ad37037 Asset/shot lists: use task types from project's Attract properties 2017-06-14 15:26:09 +02:00
a13ba17545 Fixed borked import 2017-05-31 10:49:03 +02:00
30397fc12f Pass full name of SVNer account as keyword arg 2017-05-18 15:38:30 +02:00
dc4cf6aecc Set explicit name for SVNer account
It now includes the project ID it's created for, and the fact that it's
a SVNer account, just for easy identification.
2017-05-18 10:03:12 +02:00
4e8c735f6b Python 3.6 compatibility: Applied 2to3 2017-03-03 15:08:48 +01:00
2172500dd6 Take pagination into account when listing tasks for all shots.
This is a stop-gap measure; we probably want to abstract this away into
something more reusable. Better to do that after switching to Python 3,
though.
2017-03-02 17:32:11 +01:00
3ee875d761 Added 'camera' column
Officially requested by Colin Levy by application of Camera Polish
Requisition Form 4B, signed by Colin Levy on this day at the Blender
Institute.
2017-02-10 11:20:48 +01:00
173626d46e Move Attract commands into attract subcommand 2016-12-06 23:09:13 +01:00
97f75a04e5 Only allow commenting when user has PUT access on the node. 2016-11-11 15:52:33 +01:00
Dalai Felinto
a9b894ed77 Implement Trim End 2016-11-10 18:55:14 +01:00
268d1f28e3 Include commit message in SVN activity 2016-11-10 15:34:03 +01:00
6628ce0b15 Fix bug when SVN-committing on task without parent 2016-11-10 15:34:03 +01:00
a169701793 Favicon for Attract 2016-11-10 13:07:48 +01:00
ca69b43839 Prevent global 404 on /attract when an activity can't be linked.
This happens when an activity is on a deleted item. This change implies
that "someone deleted X" activities aren't going to be shown.
2016-11-10 11:33:49 +01:00
6ebf3b6493 Activity when commenting: don't store context node type
It wasn't handled properly and caused commenting not to show up as activity
2016-11-10 09:51:45 +01:00
497bbb8273 Editing the name of a shot/task/asset now logs the old and new name in the activity 2016-11-10 09:34:32 +01:00
1134bb82a0 Prevent error when task_type is given but None. 2016-11-10 09:34:02 +01:00
08c82688e7 Tasks: set default assigned_to to {users: []}.
When the task is assigned to a user, this prevents a change of
'assigned_to' to a dict {users: [user_id]}. Instead, the
activity will be registered on 'assigned_to.users', which is nicer.
2016-11-10 09:33:10 +01:00
6217934c99 Task types: also take parent node type into account 2016-11-09 17:12:23 +01:00
17dd73f474 Task types are now determined by the page context, not hard-coded to shot task types 2016-11-09 17:01:03 +01:00
65facd8b07 Proper task types for assets 2016-11-09 15:37:19 +01:00
0e170464e6 Templates & Flask end-points for managing assets. 2016-11-09 14:57:46 +01:00
3346bb1364 Reworked ShotManager into ShotAssetManager 2016-11-09 13:58:46 +01:00
43e6e5cef9 Introducing Attract assets, with a pretty similar workflow to shots. 2016-11-09 13:48:01 +01:00
88a4a2fab3 Moved attract.shots to attract.shots_and_assets
Assets are going to be pretty much the same thing as shots, with a few
different properties. Hooks and much other code can be reused.
2016-11-09 13:00:07 +01:00
2bb332c58a Moved node_setattr() to pillar.api.utils. 2016-11-09 12:49:48 +01:00
c4b9564398 Corrected task parent types. 2016-11-09 12:40:49 +01:00
b8e2151a33 Pikaday with time support 2016-11-08 17:51:35 +01:00
da3ae6fbb2 Move clipboard.min.js to Pillar 2016-11-08 15:49:11 +01:00
b345770296 Allow removing task due date. 2016-11-08 13:59:08 +01:00
df0ca31687 parse date for display 2016-11-07 17:11:42 +01:00
691bc86ddf Fixed bug viewing unassigned task without modification rights. 2016-11-07 12:16:40 +01:00
a04211eebd Introducing Due Date for Tasks
Thanks to Dr. Sybren and Francesco for support!
2016-11-07 12:02:38 +01:00
3d6e8a0678 Redirect /project to /shots for the time being 2016-11-07 11:05:06 +01:00
d3afccd843 Fix for nr_of_shots calculation, by Dr. Sybren 2016-11-07 11:04:41 +01:00
e6e0733149 Compute some stats on shots if used in the edit. 2016-11-04 16:42:42 +01:00
5ee3c0d54f Ensure used_in_edit is always set on new shots. 2016-11-04 16:42:42 +01:00
08628fb107 More severe logging when receiving invalid request on SVN log service 2016-11-04 15:22:39 +01:00
9ec08efc40 Don't undelete when unlinking a deleted shot. 2016-11-04 13:42:17 +01:00
e7126edd7a Allow Blender to set shot 'used_in_edit' via '$set' PATCH cmd 2016-11-04 13:42:17 +01:00
17f4b749b4 Oops 2016-11-03 18:38:13 +01:00