0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:3111b94792ef981fe3351064b4a036f902eb4d02
Branches Tags
0x2620:master
..
compare: 0x2620:aaa9a4a5386a48b76b8f3ccd5ac457fa8f748a40
Branches Tags
0x2620:master

2 commits
3111b94792 ... aaa9a4a538

Author SHA1 Message Date
j
aaa9a4a538 update placeholder after setting a mixed field to an empty value 2019-01-31 11:03:18 +05:30
j
8866960009 use in operator(&) to query many ids 2019-01-31 11:02:20 +05:30
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
static/js/editDialog.js
View file

@ -77,15 +77,16 @@ oml.ui.editDialog = function() {
oml.api.find({
keys: keys,
query: {
conditions: ids.map(function(id) {
return {
conditions: [
{
key: 'id',
operator: '==',
value: id
};
}),
operator: '|'
operator: '&',
value: ids
}
],
operator: '&'
},
range: [0, ids.length]
}, function(result) {
var data = {},
isMixed = {},

25
static/js/infoView.js
View file

@ -8,6 +8,8 @@ oml.ui.infoView = function(externalData, isMixed) {
arrayKeys = ['author', 'place', 'publisher', 'language', 'categories'],
editables = {},
iconSize = externalData ? 256 : ui.iconSize,
isMultiple = arguments.length == 2,
@ -484,7 +486,7 @@ oml.ui.infoView = function(externalData, isMixed) {
marginTop: '-2px'
})
.append(
Ox.EditableContent({
editables['title'] = Ox.EditableContent({
clickLink: oml.clickLink,
editable: isEditable,
placeholder: formatLight(Ox._(
@ -512,7 +514,7 @@ oml.ui.infoView = function(externalData, isMixed) {
marginTop: '2px'
})
.append(
Ox.EditableContent({
editables['author'] = Ox.EditableContent({
clickLink: oml.clickLink,
editable: isEditable,
format: function(value) {
@ -557,7 +559,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>')
.html(formatKey(key))
.appendTo($div);
Ox.EditableContent({
editables[key] = Ox.EditableContent({
clickLink: oml.clickLink,
editable: isEditable,
format: function(value) {
@ -599,7 +601,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>')
.html(formatKey(key))
.appendTo($div);
Ox.EditableContent({
editables[key] = Ox.EditableContent({
clickLink: oml.clickLink,
editable: isEditable,
format: function(value) {
@ -641,7 +643,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>')
.html(formatKey('categories'))
.appendTo($div);
Ox.EditableContent({
editables['categories'] = Ox.EditableContent({
clickLink: oml.clickLink,
editable: isEditable,
format: function(value) {
@ -672,7 +674,7 @@ oml.ui.infoView = function(externalData, isMixed) {
$('<span>')
.html(formatKey('isbn'))
.appendTo($div);
Ox.EditableContent({
editables['isbn'] = Ox.EditableContent({
editable: isEditable,
format: function(value) {
return (value ? [
@ -709,7 +711,7 @@ oml.ui.infoView = function(externalData, isMixed) {
textAlign: 'justify'
})
.append(
Ox.EditableContent({
editables[key] = Ox.EditableContent({
clickLink: oml.clickLink,
editable: isEditable,
format: function(value) {
@ -798,6 +800,13 @@ 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)) {
@ -815,7 +824,7 @@ oml.ui.infoView = function(externalData, isMixed) {
result.data.id, key, result.data[key]
);
}
that.updateElement(result.data, [$data]);
$data && that.updateElement(result.data, [$data]);
that.triggerEvent('change', Ox.extend({}, key, value));
});
}