Fix on_commit_queue action for rename_file; Fix tag sorting

This commit is contained in:
voussoir 2017-03-10 05:18:49 -08:00
parent 072e9a7430
commit 1fc098a37f
2 changed files with 2 additions and 1 deletions

View file

@ -757,7 +757,7 @@ class Photo(ObjectBase):
self.photodb.log.debug('Committing - rename file') self.photodb.log.debug('Committing - rename file')
self.photodb.commit() self.photodb.commit()
else: else:
queue_action = {'action': args, 'args': args} queue_action = {'action': action, 'args': args}
self.photodb.on_commit_queue.append(queue_action) self.photodb.on_commit_queue.append(queue_action)
self.__reinit__() self.__reinit__()

View file

@ -585,6 +585,7 @@ def get_tags_core(specific_tag=None):
else: else:
tags = specific_tag.walk_children() tags = specific_tag.walk_children()
tags = list(tags) tags = list(tags)
tags.sort(key=lambda x: x.qualified_name())
return tags return tags
@site.route('/tags') @site.route('/tags')