Permalink
Browse files

Merge remote-tracking branch 'origin/dev' into dev

  • Loading branch information...
2 parents 36e7547 + 8d744a1 commit 9161d32d9e96e58ca800bf51817a39cf3c2eff26 @sjl sjl committed Apr 3, 2013
View
@@ -24,6 +24,7 @@ media/embed.js
media/js/config.js
media/js/statwidget/statwidgetconfig.js
media/src/js/embedder/conf.js
+media/src/js/popcorn/popcorn.netflix.js
media/js/mirosubs-widgetizer*.js
media/js/mirosubs-extension.js
media/js/mirosubs-statwidget.js
View
@@ -1861,6 +1861,8 @@ def _complete_subtitle(self):
_create_translation_tasks(self.team_video, sv)
upload_subtitles_to_original_service.delay(sv.pk)
+ task = None
+ return task
def _complete_translate(self):
"""Handle the messy details of completing a translate task."""
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,28 +1,9 @@
from django.core.management import call_command
-from apps.auth.models import CustomUser as User
from apps.teams.models import Team, TeamMember, Workflow
from widget.rpc import Rpc
-def create_member(team, role):
- username = "test_user_%s" % (User.objects.count() + 1)
- user = User.objects.get_or_create(username=username)[0]
- member = TeamMember.objects.get_or_create(team=team, role=role, user=user)[0]
- return member
-
-def create_team(slug=None, review_setting=0, approve_setting=0,
- autocreate_subtitle=False, autocreate_translate=False):
- team = Team.objects.create(
- slug=slug or 'test team',
- name='test team',
- workflow_enabled = bool(review_setting or approve_setting))
- if review_setting or approve_setting:
- Workflow.objects.get_or_create(team=team, review_allowed=review_setting,
- approve_allowed = approve_setting, autocreate_translate=autocreate_translate,
- autocreate_subtitle=autocreate_subtitle)
- return team
-
def refresh_obj(m):
return m.__class__._default_manager.get(pk=m.pk)
@@ -345,7 +345,7 @@ var angular = angular || null;
$scope.isEditingAny = true;
$scope.$digest();
});
- $scope.$root.$on('editingDone', function() {
+ $scope.$root.$on('editing-done', function() {
$scope.isEditingAny = false;
$scope.$digest();
});
@@ -368,7 +368,7 @@ var angular = angular || null;
$scope.isEditing = false;
// Tell the root scope that we're no longer editing, now.
- $scope.$root.$emit('editingDone');
+ $scope.$root.$emit('editing-done');
var content = $scope.parser.content($scope.subtitle, newValue);
Oops, something went wrong.

0 comments on commit 9161d32

Please sign in to comment.