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

Compare commits

base: 0x2620:029ad03fd533d33db1159c42335d459265702c36
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:b56fdeea721712d0750f15db4fc1134b93ada400
Branches Tags
0x2620:master
0x2620:stable

2 commits
029ad03fd5 ... b56fdeea72

Author SHA1 Message Date
j
b56fdeea72 don't steal focus from input elements 2018-11-14 14:36:04 +00:00
j
5826504d0f don't add empty values 2018-11-14 14:36:04 +00:00
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/item/models.py
View file

@ -1105,7 +1105,7 @@ class Item(models.Model):
for a in Entity.objects.filter(id__in=[ox.fromAZ(i) for i in current_values]).values('name') for a in Entity.objects.filter(id__in=[ox.fromAZ(i) for i in current_values]).values('name')
] ]
current_values = [ox.decode_html(ox.strip_tags(v.replace('<br>', ' '))) for v in current_values] current_values = [ox.decode_html(ox.strip_tags(v.replace('<br>', ' '))) for v in current_values]
current_values = [unicodedata.normalize('NFKD', v) for v in current_values] current_values = [unicodedata.normalize('NFKD', v) for v in current_values if v]
self.update_facet_values(key, current_values) self.update_facet_values(key, current_values)
def update_facet_values(self, key, current_values): def update_facet_values(self, key, current_values):

4
static/js/editPanel.js
View file

@ -412,7 +412,9 @@ pandora.ui.editPanel = function(isEmbed) {
updateSmallTimelineURL(); updateSmallTimelineURL();
ui.edits[ui.edit].view == 'grid' && enableDragAndDrop(); ui.edits[ui.edit].view == 'grid' && enableDragAndDrop();
that.gainFocus(); if (!Ox.Focus.focusedElementIsInput()) {
that.gainFocus();
}
} }
function renderEdits() { function renderEdits() {