fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
outstanding migrations
[wolnelektury.git]
/
src
/
catalogue
/
models
/
tag.py
diff --git
a/src/catalogue/models/tag.py
b/src/catalogue/models/tag.py
index
06aa7a1
..
1531973
100644
(file)
--- a/
src/catalogue/models/tag.py
+++ b/
src/catalogue/models/tag.py
@@
-160,24
+160,24
@@
class Tag(TagBase):
has_description.boolean = True
@staticmethod
has_description.boolean = True
@staticmethod
- def get_tag_list(tag
s
):
- if isinstance(tag
s
, basestring):
- if not tag
s
:
+ def get_tag_list(tag
_str
):
+ if isinstance(tag
_str
, basestring):
+ if not tag
_str
:
return []
return []
-
real_
tags = []
+ tags = []
ambiguous_slugs = []
category = None
deprecated = False
ambiguous_slugs = []
category = None
deprecated = False
- tags_splitted = tag
s
.split('/')
+ tags_splitted = tag
_str
.split('/')
for name in tags_splitted:
if category:
for name in tags_splitted:
if category:
-
real_
tags.append(Tag.objects.get(slug=name, category=category))
+ tags.append(Tag.objects.get(slug=name, category=category))
category = None
elif name in Tag.categories_rev:
category = Tag.categories_rev[name]
else:
try:
category = None
elif name in Tag.categories_rev:
category = Tag.categories_rev[name]
else:
try:
-
real_
tags.append(Tag.objects.get(slug=name))
+ tags.append(Tag.objects.get(slug=name))
deprecated = True
except Tag.MultipleObjectsReturned:
ambiguous_slugs.append(name)
deprecated = True
except Tag.MultipleObjectsReturned:
ambiguous_slugs.append(name)
@@
-188,14
+188,14
@@
class Tag(TagBase):
if ambiguous_slugs:
# some tags should be qualified
e = Tag.MultipleObjectsReturned()
if ambiguous_slugs:
# some tags should be qualified
e = Tag.MultipleObjectsReturned()
- e.tags =
real_
tags
+ e.tags = tags
e.ambiguous_slugs = ambiguous_slugs
raise e
if deprecated:
e.ambiguous_slugs = ambiguous_slugs
raise e
if deprecated:
- raise Tag.UrlDeprecationWarning(tags=
real_
tags)
- return
real_
tags
+ raise Tag.UrlDeprecationWarning(tags=tags)
+ return tags
else:
else:
- return TagBase.get_tag_list(tag
s
)
+ return TagBase.get_tag_list(tag
_str
)
@property
def url_chunk(self):
@property
def url_chunk(self):