Merge branch 'master' of soutade.fr:dynastie
This commit is contained in:
commit
652b279850
24
models.py
24
models.py
|
@ -262,6 +262,7 @@ class Post(models.Model):
|
|||
my_tags = []
|
||||
# Create new tags
|
||||
for tag in tags.split(','):
|
||||
if tag == '': continue
|
||||
tag_slug = slugify(tag)
|
||||
found = False
|
||||
for t in tags_list:
|
||||
|
@ -277,6 +278,7 @@ class Post(models.Model):
|
|||
# Add new tags
|
||||
post_tags_list = Tag.objects.filter(post=self.id)
|
||||
for tag in tags.split(','):
|
||||
if tag == '': continue
|
||||
tag_slug = slugify(tag)
|
||||
found = False
|
||||
for t in post_tags_list:
|
||||
|
@ -291,16 +293,20 @@ class Post(models.Model):
|
|||
break
|
||||
|
||||
# Remove old tags
|
||||
for t in post_tags_list:
|
||||
found = False
|
||||
for tag in tags.split(','):
|
||||
tag_slug = slugify(tag)
|
||||
if t.name_slug == tag_slug:
|
||||
found = True
|
||||
break
|
||||
if not found:
|
||||
# print 'Remove ' + t.name_slug
|
||||
if tags == '':
|
||||
for t in post_tags_list:
|
||||
self.tags.remove(t)
|
||||
else:
|
||||
for t in post_tags_list:
|
||||
found = False
|
||||
for tag in tags.split(','):
|
||||
tag_slug = slugify(tag)
|
||||
if t.name_slug == tag_slug:
|
||||
found = True
|
||||
break
|
||||
if not found:
|
||||
# print 'Remove ' + t.name_slug
|
||||
self.tags.remove(t)
|
||||
|
||||
self.save()
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<div class="menu_content_header">Recherche</div>
|
||||
<div id="menu_main">
|
||||
<dyn:replace div_name="form" id="search_form" method="POST" action="/search/dyn:blog_id">
|
||||
<input type="text" name="text" onkeypress="handleKeyPress(event,this.form)"/>
|
||||
<input type="text" name="text" id="search_text" onkeypress="handleKeyPress(event,this.form)"/>
|
||||
</dyn:replace>
|
||||
</div>
|
||||
</div>
|
||||
|
|
12
sites/blog.soutade.fr/_search.html
Executable file
12
sites/blog.soutade.fr/_search.html
Executable file
|
@ -0,0 +1,12 @@
|
|||
<dyn:base file="_base.html" block="content" xmlns:dyn="http://indefero.soutade.fr/p/dynastie">
|
||||
<dyn:posts limit="25">
|
||||
<div class="post_header">
|
||||
<dyn:title/>
|
||||
<div class="post_sub_header">
|
||||
<dyn:date/> | <div class="author_icon"> Écrit par <dyn:author/> </div>
|
||||
</div>
|
||||
<dyn:tags link="1"/>
|
||||
</div>
|
||||
<dyn:post_content/>
|
||||
</dyn:posts>
|
||||
</dyn:base>
|
|
@ -449,3 +449,8 @@ ul li
|
|||
padding:0;
|
||||
margin:0;
|
||||
}
|
||||
|
||||
#search_text
|
||||
{
|
||||
width:100%;
|
||||
}
|
Loading…
Reference in New Issue
Block a user