0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

fix files/archive conflict, move item files to data/media, rename api from *File(s) to *Media

Browse source
This commit is contained in:
j 2013-03-25 12:57:20 +00:00
commit 5c995553c9
8 changed files with 292 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
static/js/pandora/filesView.js
View file

@ -217,7 +217,7 @@ pandora.ui.filesView = function(options, self) {
columnsVisible: true,
id: 'files',
items: function(data, callback) {
pandora.api.findFiles(Ox.extend(data, {
pandora.api.findMedia(Ox.extend(data, {
query: self.filesQuery
}), callback);
},
@ -231,7 +231,7 @@ pandora.ui.filesView = function(options, self) {
if (data.key == 'selected') {
var ignored = self.$filesList.value(data.id, 'instances')
.filter(function(i) {return i.ignore; }).length > 0;
pandora.api.editFiles({
pandora.api.editMedia({
files: [{
id: data.id,
ignore: !ignored
@ -247,7 +247,7 @@ pandora.ui.filesView = function(options, self) {
return self.$filesList.value(id, 'instances').length == 0;
});
if (ids.length > 0 && pandora.user.level == 'admin') {
pandora.api.removeFiles({
pandora.api.removeMedia({
ids: ids
}, function(result) {
Ox.Request.clearCache();
@ -456,7 +456,7 @@ pandora.ui.filesView = function(options, self) {
}
function ignoreFiles() {
pandora.api.editFiles({
pandora.api.editMedia({
files: self.selected.map(function(id) {
return {id: id, ignore: true};
})
@ -477,7 +477,7 @@ pandora.ui.filesView = function(options, self) {
self.$moveButton.options(
{disabled: true, title: 'Moving Files...'}
);
pandora.api.moveFiles(data, function(result) {
pandora.api.moveMedia(data, function(result) {
if (
pandora.user.ui.item == self.options.id
&& pandora.user.ui.itemView == 'files'
@ -526,11 +526,11 @@ pandora.ui.filesView = function(options, self) {
function saveChanges() {
self.$saveButton.options({disabled: true, title: 'Saving Changes...'});
pandora.api.findFiles({
pandora.api.findMedia({
keys: ['id'],
query: self.filesQuery
}, function(result) {
pandora.api.editFiles({
pandora.api.editMedia({
files: result.data.items.map(function(item) {
[
'version', 'part', 'partTitle', 'language', 'extension'

4
static/js/pandora/mainMenu.js
View file

@ -332,9 +332,7 @@ pandora.ui.mainMenu = function() {
} else if (data.id == 'findsimilar') {
pandora.$ui.sequencesDialog = pandora.ui.sequencesDialog().open();
} else if (data.id == 'files') {
(pandora.$ui.filesDialog || (
pandora.$ui.filesDialog = pandora.ui.filesDialog()
)).open();
pandora.$ui.filesDialog = pandora.ui.filesDialog().open();
} else if (data.id == 'titles') {
(pandora.$ui.titlesDialog || (
pandora.$ui.titlesDialog = pandora.ui.titlesDialog()

4
static/js/pandora/uploadDialog.js
View file

@ -154,7 +154,7 @@ pandora.ui.uploadDialog = function(data) {
item,
oshash = info.oshash;
resetProgress();
pandora.api.addFile({
pandora.api.addMedia({
filename: filename,
id: oshash,
info: info,
@ -337,7 +337,7 @@ pandora.ui.uploadDialog = function(data) {
oshash = info.oshash,
filename = pandora.firefogg.sourceFilename,
item;
pandora.api.findFiles({
pandora.api.findMedia({
query: {
conditions: [{key: 'oshash', value: oshash}]
},