voussoir
/
etiquette
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extremely minor touchups.

master
voussoir 2018-09-23 14:57:25 -07:00
parent 95edc4d397
commit 20e41ad689
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etiquette/exceptions.py
View File

@ -113,7 +113,7 @@ class CantGroupSelf(EtiquetteException):
error_message = 'Cannot group {} into itself.' error_message = 'Cannot group {} into itself.'
class CantSynonymSelf(EtiquetteException): class CantSynonymSelf(EtiquetteException):
error_message = 'Cannot apply synonym to self.' error_message = 'Cannot make {} a synonym of itself.'
class EasyBakeError(EtiquetteException): class EasyBakeError(EtiquetteException):
error_message = '{}' error_message = '{}'

2
etiquette/objects.py
View File

@ -1214,7 +1214,7 @@ class Tag(ObjectBase, GroupableMixin):
synname = self.photodb.normalize_tagname(synname) synname = self.photodb.normalize_tagname(synname)
if synname == self.name: if synname == self.name:
raise exceptions.CantSynonymSelf() raise exceptions.CantSynonymSelf(self)
self.photodb.assert_no_such_tag(name=synname) self.photodb.assert_no_such_tag(name=synname)

2
frontends/etiquette_flask/etiquette_flask/decorators.py
View File

@ -10,7 +10,7 @@ from . import jsonify
def catch_etiquette_exception(function): def catch_etiquette_exception(function):
''' '''
If an EtiquetteException is raised, automatically catch it and convert it If an EtiquetteException is raised, automatically catch it and convert it
into a response so that the user isn't receiving error 500. into a json response so that the user isn't receiving error 500.
''' '''
@functools.wraps(function) @functools.wraps(function)
def wrapped(*args, **kwargs): def wrapped(*args, **kwargs):

5
frontends/etiquette_flask/static/js/common.js
View File

@ -12,9 +12,8 @@ function _request(method, url, callback)
{ {
if (callback != null) if (callback != null)
{ {
var text = request.responseText;
var response = { var response = {
"data": JSON.parse(text), "data": JSON.parse(request.responseText),
"meta": {} "meta": {}
}; };
response["meta"]["request_url"] = url; response["meta"]["request_url"] = url;
@ -179,7 +178,7 @@ function init_button_with_confirm()
delete button.dataset.promptClass; delete button.dataset.promptClass;
var button_confirm = document.createElement("button"); var button_confirm = document.createElement("button");
button_confirm.innerText = button.dataset.confirm || button.innerText; button_confirm.innerText = (button.dataset.confirm || button.innerText).trim();
button_confirm.className = button.dataset.confirmClass || ""; button_confirm.className = button.dataset.confirmClass || "";
holder_stage2.appendChild(button_confirm); holder_stage2.appendChild(button_confirm);
holder_stage2.appendChild(document.createTextNode(" ")); holder_stage2.appendChild(document.createTextNode(" "));

5
frontends/etiquette_flask/templates/bookmarks.html
View File

@ -10,7 +10,7 @@
<script src="/static/js/editor.js"></script> <script src="/static/js/editor.js"></script>
<style> <style>
#bookmarks #bookmark_list
{ {
display: flex; display: flex;
flex: 0 0 auto; flex: 0 0 auto;
@ -45,7 +45,8 @@
<body> <body>
{{header.make_header(session=session)}} {{header.make_header(session=session)}}
<div id="content_body"> <div id="content_body">
<div id="bookmarks"> <div id="bookmark_list">
<h2>Bookmarks</h2>
{% for bookmark in bookmarks %} {% for bookmark in bookmarks %}
<div class="bookmark_card" data-bookmark-id="{{bookmark.id}}"> <div class="bookmark_card" data-bookmark-id="{{bookmark.id}}">
<a <a