projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged. Oh no, we have two different user relationship models. Mine's in relations...
[zzz-floof.git]
/
floof
/
controllers
/
tag.py
diff --git
a/floof/controllers/tag.py
b/floof/controllers/tag.py
index
ef3c7ce
..
e5ce85b
100644
(file)
--- a/
floof/controllers/tag.py
+++ b/
floof/controllers/tag.py
@@
-9,7
+9,7
@@
from pylons import url
log = logging.getLogger(__name__)
import elixir
log = logging.getLogger(__name__)
import elixir
-from floof.model
.art
import Art, Tag
+from floof.model import Art, Tag
class TagController(BaseController):
class TagController(BaseController):
@@
-18,12
+18,12
@@
class TagController(BaseController):
tag = h.get_object_or_404(Tag, id=id)
elixir.session.delete(tag)
elixir.session.commit()
tag = h.get_object_or_404(Tag, id=id)
elixir.session.delete(tag)
elixir.session.commit()
- redirect(url('art', id=art_id))
-
+ 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)
+ c.art.add_tags(request.params
.get("tags","")
, c.user)
elixir.session.commit()
elixir.session.commit()
- redirect(url('art', id=c.art.id))
+ redirect(url('
show_
art', id=c.art.id))