projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed two minor crashes in lib.tags.
[zzz-floof.git]
/
floof
/
controllers
/
tag.py
diff --git
a/floof/controllers/tag.py
b/floof/controllers/tag.py
index
c00eaf6
..
1ceaf7c
100644
(file)
--- a/
floof/controllers/tag.py
+++ b/
floof/controllers/tag.py
@@
-1,16
+1,18
@@
import logging
import logging
+import re
-from pylons import request, response, session, tmpl_context as c,
h
+from pylons import request, response, session, tmpl_context as c,
url
from pylons.controllers.util import abort, redirect
from pylons.controllers.util import abort, redirect
+import elixir
+from floof.model import Art, ArtUser, ArtUserType, Tag, TagText, User
+from floof.lib import helpers as h
from floof.lib.base import BaseController, render
from floof.lib.base import BaseController, render
-from pylons import url
+from floof.lib.tags import add_tags
+from floof.lib.dbhelpers import find_or_create
log = logging.getLogger(__name__)
log = logging.getLogger(__name__)
-import elixir
-from floof.model.art import Art, Tag
-
class TagController(BaseController):
# TODO: login required
class TagController(BaseController):
# TODO: login required
@@
-19,11
+21,18
@@
class TagController(BaseController):
elixir.session.delete(tag)
elixir.session.commit()
redirect(url('show_art', id=art_id))
elixir.session.delete(tag)
elixir.session.commit()
redirect(url('show_art', id=art_id))
-
+
# TODO: login required
def create(self, art_id):
c.art = h.get_object_or_404(Art, id=art_id)
# TODO: login required
def create(self, art_id):
c.art = h.get_object_or_404(Art, id=art_id)
- c.art.add_tags(request.params["tags"], c.user)
- elixir.session.commit()
- redirect(url('show_art', id=c.art.id))
+ tag_string = request.params.get('tags', '')
+ add_tags(
+ art=c.art,
+ tag_string=tag_string,
+ adding_user=c.user,
+ me=c.user,
+ )
+
+ # Add or remove tags
+ redirect(url('show_art', id=c.art.id))