fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-22 09:38:18 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed minified marionette

Browse Source
This commit is contained in:
Fergal Moran
2014-09-03 18:16:19 +01:00
parent 1fef95d982
commit fb7995c40c
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spa/management/commands/azure_util.py
View File

@@ -4,13 +4,15 @@ from django.core.management.base import NoArgsCommand
from django.utils.encoding import smart_str from django.utils.encoding import smart_str
from dss.storagesettings import AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY, AZURE_CONTAINER from dss.storagesettings import AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY, AZURE_CONTAINER
from spa.models import Mix from spa.models import Mix
from django.db.models import Count
class Command(NoArgsCommand): class Command(NoArgsCommand):
def handle_noargs(self, **options): def handle_noargs(self, **options):
try: try:
blob_service = BlobService(AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY) blob_service = BlobService(AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY)
mixes = Mix.objects.filter(archive_updated=False) mixes = Mix.objects.filter(archive_updated=False)
c = len(mixes)
i = 1
for mix in mixes: for mix in mixes:
try: try:
blob_name = "%s.%s" % (mix.uid, mix.filetype) blob_name = "%s.%s" % (mix.uid, mix.filetype)
@@ -24,7 +26,8 @@ class Command(NoArgsCommand):
x_ms_blob_content_type='application/octet-stream', x_ms_blob_content_type='application/octet-stream',
x_ms_blob_content_disposition='attachment;filename="%s"' % (download_name) x_ms_blob_content_disposition='attachment;filename="%s"' % (download_name)
) )
print "Processed: %s" % mix.uid print "Processed: %s (%d of %d)" % (mix.uid, i, c)
i = i + 1
mix.archive_updated = True mix.archive_updated = True
mix.save() mix.save()
else: else:

19
static/js/lib/backbone.marionette.js
View File

@@ -1,22 +1,3 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v2.1.0
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
//
// http://marionettejs.com
/*!
* Includes BabySitter
* https://github.com/marionettejs/backbone.babysitter/
*
* Includes Wreqr
* https://github.com/marionettejs/backbone.wreqr/
*/
(function(root, factory) { (function(root, factory) {
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {