[Oi-commits] r2570 - in trunk: st templates

[oi-svn at pardus.org.tr]

Author: jnmbk
Date: Fri May 29 17:52:11 2009
New Revision: 2570

Modified:
   trunk/st/views.py
   trunk/templates/advancedsearch.html
Log:
search in workshop

Modified: trunk/st/views.py
=================================================================
--- trunk/st/views.py	(original)
+++ trunk/st/views.py	Fri May 29 17:52:11 2009
@@ -157,6 +157,7 @@
                     games = Game.objects.filter(title__icontains=term, status=True).order_by('-update')[:50]
                     fs = FS.objects.filter(title__icontains=term, status=True).order_by('-update')[:50]
                     howto = HowTo.objects.filter(title__icontains=term, status=True).order_by('-update')[:50]
+                    workshop = Workshop.objects.filter(title__icontains=term, status=True).order_by('-update')[:50]
                     flatpages = FlatPage.objects.filter(title__icontains=term)[:50]
             else:
                 if search_in == 0 or search_in == 2:
@@ -169,6 +170,7 @@
                     games = Game.objects.filter(Q(title__icontains=term)|Q(text__icontains=term)).filter(status=True).order_by('-update')[:50]
                     fs = FS.objects.filter(Q(title__icontains=term)|Q(text__icontains=term)).filter(status=True).order_by('-update')[:50]
                     howto = HowTo.objects.filter(Q(title__icontains=term)|Q(text__icontains=term)).filter(status=True).order_by('-update')[:50]
+                    workshop = Workshop.objects.filter(Q(title__icontains=term)|Q(text__icontains=term)).filter(status=True).order_by('-update')[:50]
                     flatpages = FlatPage.objects.filter(Q(title__icontains=term)|Q(text__icontains=term))[:50]
             searched = True
     else:

Modified: trunk/templates/advancedsearch.html
=================================================================
--- trunk/templates/advancedsearch.html	(original)
+++ trunk/templates/advancedsearch.html	Fri May 29 17:52:11 2009
@@ -81,6 +81,17 @@
         </div>
     {% endif %}
 
+    {% if workshop %}
+        <div class="workshop">
+            <div class="title"><span>Atölye ({{ workshop.count }} adet)</span></div>
+            <ul>
+            {% for obj in workshop %}
+                <li><a href="{{ obj.get_absolute_url }}">{{ obj.title }}</a><br />{{ obj.sum|striptags }}</li>
+            {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
+
     {% if ideas %}
         <div class="ideas">
             <div class="title"><span>Yeni Fikirler ({{ ideas.count }} adet)</span></div>