Permalink
Browse files

Merge branch 'dev' into x-third-party-auth

  • Loading branch information...
2 parents 89d2dc9 + f3cd617 commit 7997cd64b549ec446f32dd87c8dda35206808834 @sjl sjl committed Jun 27, 2012
Showing with 12 additions and 5 deletions.
  1. +1 −1 deploy/fabfile.py
  2. +10 −3 docs/api.rst
  3. +1 −1 optional/unisubs-integration
View
@@ -548,7 +548,7 @@ def update_integration():
with Output("Updating nested unisubs-integration repositories"):
_execute_on_all_hosts(_update_integration)
-def _notify(subj, msg, audience='sysadmin@pculture.org'):
+def _notify(subj, msg, audience='sysadmin@pculture.org ehazlett@pculture.org'):
mail_from_host = 'pcf-us-dev.pculture.org:2191'
old_host = env.host_string
View
@@ -208,8 +208,8 @@ With the same parameters for creation. Note that through out our system, a
video cannot have it's URLs changed. So you can change other video attributes
(title, description) but the URL sent must be the same original one.
-Moving videos between teams
-+++++++++++++++++++++++++++
+Moving videos between teams and projects
+++++++++++++++++++++++++++++++++++++++++
In order to move a video from one team to another, you can make a request to
change the video where you change the ``team`` value in the Video Resource.
@@ -232,8 +232,15 @@ originating team and permission to add a video to the target team.
Setting the ``team`` value to ``null`` will remove it from its current team.
A similar mechanism can be used to change what project a given video is filed
-under.
+under. The important difference is that when moving a video to different
+project, the team must be specified in the payload even if it doesn't change.
+.. code-block:: json
+
+ {
+ "team:" "team-slug",
+ "project": "new-project"
+ }
Example response:
@@ -1 +1 @@
-3d2ba3cb1981ec77575d0602ad4c0989c2ea4b70
+6716c66e410d0b0ff75d5e0652587bd7a0a37b1d

0 comments on commit 7997cd6

Please sign in to comment.