diff --git a/static/js/editDialog.js b/static/js/editDialog.js index 6f6b201..1b3aebf 100644 --- a/static/js/editDialog.js +++ b/static/js/editDialog.js @@ -77,16 +77,15 @@ oml.ui.editDialog = function() { oml.api.find({ keys: keys, query: { - conditions: [ - { + conditions: ids.map(function(id) { + return { key: 'id', - operator: '&', - value: ids - } - ], - operator: '&' - }, - range: [0, ids.length] + operator: '==', + value: id + }; + }), + operator: '|' + } }, function(result) { var data = {}, isMixed = {}, diff --git a/static/js/infoView.js b/static/js/infoView.js index 850bd79..1a8e1c9 100644 --- a/static/js/infoView.js +++ b/static/js/infoView.js @@ -8,8 +8,6 @@ oml.ui.infoView = function(externalData, isMixed) { arrayKeys = ['author', 'place', 'publisher', 'language', 'categories'], - editables = {}, - iconSize = externalData ? 256 : ui.iconSize, isMultiple = arguments.length == 2, @@ -486,7 +484,7 @@ oml.ui.infoView = function(externalData, isMixed) { marginTop: '-2px' }) .append( - editables['title'] = Ox.EditableContent({ + Ox.EditableContent({ clickLink: oml.clickLink, editable: isEditable, placeholder: formatLight(Ox._( @@ -514,7 +512,7 @@ oml.ui.infoView = function(externalData, isMixed) { marginTop: '2px' }) .append( - editables['author'] = Ox.EditableContent({ + Ox.EditableContent({ clickLink: oml.clickLink, editable: isEditable, format: function(value) { @@ -559,7 +557,7 @@ oml.ui.infoView = function(externalData, isMixed) { $('') .html(formatKey(key)) .appendTo($div); - editables[key] = Ox.EditableContent({ + Ox.EditableContent({ clickLink: oml.clickLink, editable: isEditable, format: function(value) { @@ -601,7 +599,7 @@ oml.ui.infoView = function(externalData, isMixed) { $('') .html(formatKey(key)) .appendTo($div); - editables[key] = Ox.EditableContent({ + Ox.EditableContent({ clickLink: oml.clickLink, editable: isEditable, format: function(value) { @@ -643,7 +641,7 @@ oml.ui.infoView = function(externalData, isMixed) { $('') .html(formatKey('categories')) .appendTo($div); - editables['categories'] = Ox.EditableContent({ + Ox.EditableContent({ clickLink: oml.clickLink, editable: isEditable, format: function(value) { @@ -674,7 +672,7 @@ oml.ui.infoView = function(externalData, isMixed) { $('') .html(formatKey('isbn')) .appendTo($div); - editables['isbn'] = Ox.EditableContent({ + Ox.EditableContent({ editable: isEditable, format: function(value) { return (value ? [ @@ -711,7 +709,7 @@ oml.ui.infoView = function(externalData, isMixed) { textAlign: 'justify' }) .append( - editables[key] = Ox.EditableContent({ + Ox.EditableContent({ clickLink: oml.clickLink, editable: isEditable, format: function(value) { @@ -800,13 +798,6 @@ oml.ui.infoView = function(externalData, isMixed) { if (!Ox.isEqual(edit[key], data[key])) { data[key] = edit[key]; oml.api.edit(edit, function(result) { - if (isMixed[key]) { - isMixed[key] = false - var placeholder = editables[key].options('placeholder').replace('Mixed', 'Unknown').replace('mixed', 'unknown') - editables[key].options({ - placeholder: placeholder - }) - } if (!isMultiple || ui.updateResults) { Ox.Request.clearCache(); if (Ox.contains(['title', 'author', 'description'], key)) { @@ -824,7 +815,7 @@ oml.ui.infoView = function(externalData, isMixed) { result.data.id, key, result.data[key] ); } - $data && that.updateElement(result.data, [$data]); + that.updateElement(result.data, [$data]); that.triggerEvent('change', Ox.extend({}, key, value)); }); }