fix document upload, add select callback option to document dialog, ctrl-alt-n works to add documents
This commit is contained in:
parent
7986b2487c
commit
e6117dfc61
5 changed files with 39 additions and 16 deletions
|
@ -517,6 +517,7 @@
|
||||||
"itemRequiresVideo": true,
|
"itemRequiresVideo": true,
|
||||||
"itemViews": [
|
"itemViews": [
|
||||||
{"id": "info", "title": "Info"},
|
{"id": "info", "title": "Info"},
|
||||||
|
{"id": "documents", "title": "Documents"},
|
||||||
{"id": "player", "title": "Player"},
|
{"id": "player", "title": "Player"},
|
||||||
{"id": "editor", "title": "Editor"},
|
{"id": "editor", "title": "Editor"},
|
||||||
{"id": "timeline", "title": "Timeline"},
|
{"id": "timeline", "title": "Timeline"},
|
||||||
|
|
|
@ -272,7 +272,7 @@ def upload(request):
|
||||||
file.extension = extension
|
file.extension = extension
|
||||||
file.uploading = True
|
file.uploading = True
|
||||||
file.save()
|
file.save()
|
||||||
upload_url = request.build_absolute_uri('/api/upload/file?id=%s' % file.get_id())
|
upload_url = request.build_absolute_uri('/api/upload/document?id=%s' % file.get_id())
|
||||||
return render_to_json_response({
|
return render_to_json_response({
|
||||||
'uploadUrl': upload_url,
|
'uploadUrl': upload_url,
|
||||||
'url': request.build_absolute_uri(file.get_absolute_url()),
|
'url': request.build_absolute_uri(file.get_absolute_url()),
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
pandora.ui.documentsDialog = function() {
|
pandora.ui.documentsDialog = function(options) {
|
||||||
|
options = options || {};
|
||||||
|
|
||||||
var dialogHeight = Math.round((window.innerHeight - 48) * 0.9),
|
var dialogHeight = Math.round((window.innerHeight - 48) * 0.9),
|
||||||
dialogWidth = Math.round(window.innerWidth * 0.9),
|
dialogWidth = Math.round(window.innerWidth * 0.9),
|
||||||
|
@ -165,6 +166,9 @@ pandora.ui.documentsDialog = function() {
|
||||||
select: function(data) {
|
select: function(data) {
|
||||||
selected = data.ids[0];
|
selected = data.ids[0];
|
||||||
selectFile();
|
selectFile();
|
||||||
|
options.callback && $doneButton.options({
|
||||||
|
disabled: !data.ids.length
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
@ -219,6 +223,18 @@ pandora.ui.documentsDialog = function() {
|
||||||
})
|
})
|
||||||
.appendTo($itemToolbar),
|
.appendTo($itemToolbar),
|
||||||
|
|
||||||
|
$doneButton = Ox.Button({
|
||||||
|
disabled: !!options.callback,
|
||||||
|
id: 'done',
|
||||||
|
title: options.callback ? Ox._('Select') : Ox._('Done'),
|
||||||
|
width: 48
|
||||||
|
}).bindEvent({
|
||||||
|
click: function() {
|
||||||
|
options.callback && options.callback($list.options('selected'));
|
||||||
|
that.close();
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
|
||||||
$uploadButton = Ox.FileButton({
|
$uploadButton = Ox.FileButton({
|
||||||
maxFiles: 1,
|
maxFiles: 1,
|
||||||
title: Ox._('Upload Document...'),
|
title: Ox._('Upload Document...'),
|
||||||
|
@ -293,17 +309,7 @@ pandora.ui.documentsDialog = function() {
|
||||||
}),
|
}),
|
||||||
|
|
||||||
that = Ox.Dialog({
|
that = Ox.Dialog({
|
||||||
buttons: [
|
buttons: [$doneButton],
|
||||||
Ox.Button({
|
|
||||||
id: 'done',
|
|
||||||
title: Ox._('Done'),
|
|
||||||
width: 48
|
|
||||||
}).bindEvent({
|
|
||||||
click: function() {
|
|
||||||
that.close();
|
|
||||||
}
|
|
||||||
})
|
|
||||||
],
|
|
||||||
closeButton: true,
|
closeButton: true,
|
||||||
content: $content,
|
content: $content,
|
||||||
height: dialogHeight,
|
height: dialogHeight,
|
||||||
|
|
|
@ -82,7 +82,22 @@ pandora.ui.documentsView = function(options, self) {
|
||||||
})
|
})
|
||||||
.bindEvent({
|
.bindEvent({
|
||||||
add: function(data) {
|
add: function(data) {
|
||||||
pandora.$ui.documentsDialog = pandora.ui.documentsDialog().open();
|
pandora.$ui.documentsDialog = pandora.ui.documentsDialog({
|
||||||
|
callback: function(ids) {
|
||||||
|
if (ids) {
|
||||||
|
pandora.api.addDocument({
|
||||||
|
item: pandora.user.ui.item,
|
||||||
|
ids: ids
|
||||||
|
}, function() {
|
||||||
|
Ox.Request.clearCache();
|
||||||
|
//fixme just upload list here
|
||||||
|
//self.$documentsList.reloadList();
|
||||||
|
pandora.$ui.contentPanel.replaceElement(1,
|
||||||
|
pandora.$ui.item = pandora.ui.item());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).open();
|
||||||
},
|
},
|
||||||
'delete': function(data) {
|
'delete': function(data) {
|
||||||
if (data.ids.length > 0 && options.editable) {
|
if (data.ids.length > 0 && options.editable) {
|
||||||
|
@ -124,7 +139,8 @@ pandora.ui.documentsView = function(options, self) {
|
||||||
});
|
});
|
||||||
|
|
||||||
function renderPreview() {
|
function renderPreview() {
|
||||||
var isImage = Ox.contains(['jpg', 'png'], self.selected.split('.').pop()),
|
var isImage = Ox.contains(['jpg', 'png'],
|
||||||
|
self.selected ? self.selected.split('.').pop() : ''),
|
||||||
size = {width: 256, height: 256},
|
size = {width: 256, height: 256},
|
||||||
src = '/documents/' + self.selected + (isImage ? '' : '.jpg');
|
src = '/documents/' + self.selected + (isImage ? '' : '.jpg');
|
||||||
self.$preview.empty();
|
self.$preview.empty();
|
||||||
|
|
|
@ -76,7 +76,7 @@ pandora.ui.item = function() {
|
||||||
} else if (pandora.user.ui.itemView == 'documents') {
|
} else if (pandora.user.ui.itemView == 'documents') {
|
||||||
|
|
||||||
pandora.$ui.contentPanel.replaceElement(1,
|
pandora.$ui.contentPanel.replaceElement(1,
|
||||||
pandora.$ui.documentsView = pandora.ui.documentsView(result.data)
|
pandora.$ui.documents = pandora.ui.documentsView(result.data)
|
||||||
);
|
);
|
||||||
|
|
||||||
} else if (pandora.user.ui.itemView == 'player') {
|
} else if (pandora.user.ui.itemView == 'player') {
|
||||||
|
|
Loading…
Reference in a new issue