Compare commits

..

No commits in common. "14e197819d6a6ad7f2950afeaa4895c7a3f4e045" and "823b8f2136d69f861ac102614308f950a9a67c32" have entirely different histories.

3 changed files with 5 additions and 7 deletions

View file

@ -36,13 +36,12 @@ class FulltextMixin:
return self.data.get('text', '') return self.data.get('text', '')
return '' return ''
def delete_fulltext(self):
res = self.elasticsearch().delete(index=self._ES_INDEX, doc_type='document', id=self.id)
def has_fulltext_key(): def has_fulltext_key():
return bool([k for k in settings.CONFIG['documentKeys'] if k.get('fulltext')]) return bool([k for k in settings.CONFIG['documentKeys'] if k.get('fulltext')])
def delete_fulltext(self):
if self.has_fulltext_key():
res = self.elasticsearch().delete(index=self._ES_INDEX, doc_type='document', id=self.id)
def update_fulltext(self): def update_fulltext(self):
if self.has_fulltext_key(): if self.has_fulltext_key():
text = self.extract_fulltext() text = self.extract_fulltext()

View file

@ -653,7 +653,6 @@ def delete_document(sender, **kwargs):
if t.file: if t.file:
t.delete_cache() t.delete_cache()
t.file.delete(save=False) t.file.delete(save=False)
t.delete_fulltext()
pre_delete.connect(delete_document, sender=Document) pre_delete.connect(delete_document, sender=Document)
class ItemProperties(models.Model): class ItemProperties(models.Model):

View file

@ -33,7 +33,7 @@ pandora.ui.findDocumentsElement = function() {
} }
}), }),
] : [], [ ] : [], [
pandora.$ui.findDocumentsSelect = $findSelect = Ox.Select({ $findSelect = Ox.Select({
id: 'select', id: 'select',
items: [].concat( items: [].concat(
pandora.site.documentKeys.filter(function(key) { pandora.site.documentKeys.filter(function(key) {
@ -70,7 +70,7 @@ pandora.ui.findDocumentsElement = function() {
} }
} }
}), }),
pandora.$ui.findDocumentsInput = $findInput = Ox.Input({ $findInput = Ox.Input({
autocomplete: autocompleteFunction(), autocomplete: autocompleteFunction(),
autocompleteSelect: true, autocompleteSelect: true,
autocompleteSelectHighlight: true, autocompleteSelectHighlight: true,