From oi-commits at pardus.org.tr Sat Nov 3 16:02:47 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 3 Nov 2007 16:02:47 +0200 (EET) Subject: [Oi-commits] r604 - trunk Message-ID: <20071103140247.A45DD7C0031@liste.uludag.org.tr> Author: ahmet Date: Sat Nov 3 16:02:47 2007 New Revision: 604 Modified: trunk/TODO trunk/settings.py Log: typo Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Sat Nov 3 16:02:47 2007 @@ -24,7 +24,7 @@ - Download documents as PDF support (packages, first steps) - Search support -- Forum +/ Forum + Category + Hidden + Sorting @@ -33,13 +33,12 @@ + Hidden + Sorting + Lock - / Pagination + + Pagination / Topic + Flood Control + Tags - - Hot or Not (Reddit style) + Hidden - - Hide + + Hide + Lock + Stick - Edit @@ -48,12 +47,11 @@ / Post + Flood control + Hidden - - Hide - - Delete - - Edit + + Hide + + Edit - Markup language (BBCode??) - Smiley - - Quotations + + Quotations - Feeds - Search - Log & monitor all IP's Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Sat Nov 3 16:02:47 2007 @@ -213,4 +213,4 @@ ('yozgat','Yozgat'), ('yalova', 'Yalova'), ('zonguldak','Zonguldak') -) +) \ No newline at end of file From oi-commits at pardus.org.tr Sat Nov 3 19:24:55 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 3 Nov 2007 19:24:55 +0200 (EET) Subject: [Oi-commits] r605 - in trunk: . st templates Message-ID: <20071103172455.7F4E27C0031@liste.uludag.org.tr> Author: ahmet Date: Sat Nov 3 19:24:55 2007 New Revision: 605 Added: trunk/st/forms.py trunk/templates/search.html Modified: trunk/st/views.py trunk/urls.py Log: template Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Sat Nov 3 19:24:55 2007 @@ -13,6 +13,8 @@ from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE +from oi.st.forms import SearchForm + from oi.st.models import * from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -88,6 +90,7 @@ packages = Package.objects.filter(tags__name__exact=tag) games = Game.objects.filter(tags__name__exact=tag) fs = FS.objects.filter(tags__name__exact=tag) + howto = HOWTO.objects.filter(tags__name__exact=tag) flatpages = FlatPage.objects.filter(tags__name__exact=tag) except Tag.DoesNotExist: raise Http404 @@ -108,5 +111,21 @@ web_url = WEB_URL return render_response(request, 'videobox.html', locals()) -def test(request): - return render_response(request, 'test.html') +def search(request): + if request.method == 'POST': + form = SearchForm(request.POST.copy()) + if form.is_valid(): + term = form.cleaned_data['term'] + + searched = 1 + news = News.objects.filter(text__contains=term) + fs = FS.objects.filter(text__contains=term) + howto = HowTo.objects.filter(text__contains=term) + packages = Package.objects.filter(text__contains=term) + games = Game.objects.filter(text__contains=term) + flatpages = FlatPage.objects.filter(text__contains=term) + + else: + pass + + return render_response(request, 'search.html', locals()) \ No newline at end of file Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Sat Nov 3 19:24:55 2007 @@ -106,6 +106,9 @@ (r'^etiket/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), (r'^etiket/(?P.*)/$', 'oi.st.views.tag_detail'), + #Search + (r'^arama/$', 'oi.st.views.search'), + #Download (r'^indir/$', 'oi.st.views.download'), (r'^indir/(?P.*)/surum_notu/$', 'oi.st.views.download_detail_releasenotes'), @@ -122,12 +125,9 @@ #Bug tracker (r'^bocuk/', include('oi.bug.urls')), - #Gezegen + #Planet (r'^gezegen/', include('oi.feedjack.urls')), - #FIXME: Delete this when development ends - (r'^test/$', 'oi.st.views.test'), - #Django (r'^$', 'oi.st.views.home'), (r'^admin/upload/image/add/$', 'oi.upload.views.image_upload'), From oi-commits at pardus.org.tr Sat Nov 3 19:38:54 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 3 Nov 2007 19:38:54 +0200 (EET) Subject: [Oi-commits] r606 - trunk Message-ID: <20071103173854.CA0187C0031@liste.uludag.org.tr> Author: erenturkay Date: Sat Nov 3 19:38:54 2007 New Revision: 606 Modified: trunk/settings.py Log: * should fix csrf security hole, we love oi, everyone loves oi and don't want to be hacked into :) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Sat Nov 3 19:38:54 2007 @@ -101,6 +101,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.csrf.middleware.CsrfMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', 'oi.flatpages.middleware.FlatpageFallbackMiddleware', From oi-commits at pardus.org.tr Sat Nov 3 19:39:32 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 3 Nov 2007 19:39:32 +0200 (EET) Subject: [Oi-commits] r607 - branches/stable Message-ID: <20071103173932.546597C0031@liste.uludag.org.tr> Author: erenturkay Date: Sat Nov 3 19:39:32 2007 New Revision: 607 Modified: branches/stable/settings.py Log: * merge Modified: branches/stable/settings.py ================================================================= --- branches/stable/settings.py (original) +++ branches/stable/settings.py Sat Nov 3 19:39:32 2007 @@ -101,6 +101,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.csrf.middleware.CsrfMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', 'oi.flatpages.middleware.FlatpageFallbackMiddleware', From oi-commits at pardus.org.tr Mon Nov 5 22:08:54 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 5 Nov 2007 22:08:54 +0200 (EET) Subject: [Oi-commits] r608 - in trunk: st templates Message-ID: <20071105200855.0927D7C0026@liste.uludag.org.tr> Author: ahmet Date: Mon Nov 5 22:08:54 2007 New Revision: 608 Modified: trunk/st/views.py trunk/templates/search.html Log: search in tags Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Mon Nov 5 22:08:54 2007 @@ -90,7 +90,7 @@ packages = Package.objects.filter(tags__name__exact=tag) games = Game.objects.filter(tags__name__exact=tag) fs = FS.objects.filter(tags__name__exact=tag) - howto = HOWTO.objects.filter(tags__name__exact=tag) + howto = HowTo.objects.filter(tags__name__exact=tag) flatpages = FlatPage.objects.filter(tags__name__exact=tag) except Tag.DoesNotExist: raise Http404 @@ -117,13 +117,15 @@ if form.is_valid(): term = form.cleaned_data['term'] - searched = 1 - news = News.objects.filter(text__contains=term) - fs = FS.objects.filter(text__contains=term) - howto = HowTo.objects.filter(text__contains=term) - packages = Package.objects.filter(text__contains=term) - games = Game.objects.filter(text__contains=term) - flatpages = FlatPage.objects.filter(text__contains=term) + searched = True + tags = Tag.objects.filter(name__contains=term) + news = News.objects.filter(tags__name__contains=term) + packages = Package.objects.filter(tags__name__contains=term) + games = Game.objects.filter(tags__name__contains=term) + fs = FS.objects.filter(tags__name__contains=term) + howto = HowTo.objects.filter(tags__name__contains=term) + flatpages = FlatPage.objects.filter(tags__name__contains=term) + total = (tags.count()+news.count()+packages.count()+games.count()+fs.count()+howto.count()+flatpages.count()) else: pass Modified: trunk/templates/search.html ================================================================= --- trunk/templates/search.html (original) +++ trunk/templates/search.html Mon Nov 5 22:08:54 2007 @@ -1,14 +1,74 @@ {% extends "base.html" %} {% block content %} -
- - -
+
+
+ Anahtar kelime: + +
+
+{% if searched %} +
{{ term|escape }} kelimesini i?eren sayfalar
+{% ifnotequal total 0 %} +
+ {% if news %} +
+

Haberler ({{ news.count }} adet)

+
    + {% for obj in news %} +
  • {{ obj.title }} - {{ obj.text|truncatewords:"10"|striptags }}
    • + {% endfor %} +
+
+ {% endif %} -{{ searched }} + {% if packages %} +
+

Paketler ({{ packages.count }} adet)

+
    + {% for obj in packages %} +
  • {{ obj.title }} - {{ obj.sum|striptags }}
    • + {% endfor %} +
+
+ {% endif %} -{% for package in packages %} -{{ package.title }} -{% endfor %} + {% if fs %} +
+

?lk ad?mlar ({{ fs.count }} adet)

+
    + {% for obj in fs %} +
  • {{ obj.title }} - {{ obj.sum|striptags }}
    • + {% endfor %} +
+
+ {% endif %} + + {% if games %} +
+

Oyunlar ({{ games.count }} adet)

+
    + {% for obj in games %} +
  • {{ obj.title }} - {{ obj.sum|striptags }}
    • + {% endfor %} +
+
+ {% endif %} + + {% if flatpages %} +
+

Sabit sayfalar ({{ flatpages.count }} adet)

+
    + {% for obj in flatpages %} +
  • {{ obj.title }} - {{ obj.text|truncatewords:"10"|striptags }}
    • + {% endfor %} +
+
+ {% endif %} +
+{% endifnotequal %} +{% ifequal total 0 %} +
??erik bulunamad?.
+{% endifequal %} +{% endif %} {% endblock %} \ No newline at end of file From oi-commits at pardus.org.tr Mon Nov 5 22:10:10 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Mon, 5 Nov 2007 22:10:10 +0200 (EET) Subject: [Oi-commits] r609 - in trunk: . forum templates/forum Message-ID: <20071105201010.16B1E7C0026@liste.uludag.org.tr> Author: ahmet Date: Mon Nov 5 22:10:09 2007 New Revision: 609 Added: trunk/forum/feeds.py trunk/templates/forum/feed_description.html trunk/templates/forum/feed_title.html trunk/templates/forum/merge.html Modified: trunk/TODO trunk/forum/forms.py trunk/forum/urls.py trunk/forum/views.py Log: Konu birle?tirme i?levi ve feedler yolda :) Modified: trunk/TODO ================================================================= --- trunk/TODO (original) +++ trunk/TODO Mon Nov 5 22:10:09 2007 @@ -41,7 +41,7 @@ + Hide + Lock + Stick - - Edit + + Edit ? Split ? Merge / Post Modified: trunk/forum/forms.py ================================================================= --- trunk/forum/forms.py (original) +++ trunk/forum/forms.py Mon Nov 5 22:10:09 2007 @@ -1,8 +1,20 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright 2007 Ahmet AYG?N +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt. + from django import newforms as forms +choices = ((u'1', 'Unknown'), (u'2', 'Yes'), (u'3', 'No')) + class TopicForm(forms.Form): title = forms.CharField(label='Ba?l?k', required=True, max_length=100, widget=forms.TextInput(attrs={'size': '40',})) text = forms.CharField(label='?leti', required=True, widget=forms.Textarea(attrs={'rows': '20', 'cols': '60',})) class PostForm(forms.Form): - text = forms.CharField(label='?leti', required=True, widget=forms.Textarea(attrs={'rows': '20', 'cols': '60',})) \ No newline at end of file + text = forms.CharField(label='?leti', required=True, widget=forms.Textarea(attrs={'rows': '20', 'cols': '60',})) + +class MergeForm(forms.Form): + topic2 = forms.ChoiceField(label='Konu', required=True, widget=forms.Select(choices=choices)) \ No newline at end of file Modified: trunk/forum/urls.py ================================================================= --- trunk/forum/urls.py (original) +++ trunk/forum/urls.py Mon Nov 5 22:10:09 2007 @@ -6,6 +6,12 @@ # See the file http://www.gnu.org/copyleft/gpl.txt. from django.conf.urls.defaults import patterns +from oi.forum.feeds import * + +feed_dict = { + 'rss': RSS, + 'atom': Atom, + } urlpatterns = patterns('', #(r'^feed/rss/$', 'rssfeed'), @@ -24,7 +30,13 @@ (r'^(?P.*)/(?P\d+)/hide/$', 'oi.forum.views.hide'), (r'^(?P.*)/(?P\d+)/lock/$', 'oi.forum.views.lock'), (r'^(?P.*)/(?P\d+)/stick/$', 'oi.forum.views.stick'), + (r'^(?P.*)/(?P\d+)/merge/$', 'oi.forum.views.merge'), (r'^(?P.*)/(?P\d+)/edit/$', 'oi.forum.views.edit_topic'), (r'^(?P.*)/(?P\d+)/$', 'oi.forum.views.topic'), (r'^(?P.*)/$', 'oi.forum.views.forum'), + + (r'^(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feed_dict}), + (r'^(?P.*)/user/(?P\d+)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feed_dict}), + (r'^(?P.*)/topic/(?P\d+)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feed_dict}), + (r'^(?P.*)/tag/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feed_dict}), ) \ No newline at end of file Modified: trunk/forum/views.py ================================================================= --- trunk/forum/views.py (original) +++ trunk/forum/views.py Mon Nov 5 22:10:09 2007 @@ -163,6 +163,31 @@ return render_response(request, 'forum/new_topic.html', locals()) @login_required +def merge(request, forum_slug, topic_id): + forum = get_object_or_404(Forum, slug=forum_slug) + topic = get_object_or_404(Topic, pk=topic_id) + + if forum.locked or topic.locked: + raise HttpResponseServerError #FIXME: Give an error message + + if request.method == 'POST': + form = TopicForm(request.POST.copy()) + flood,timeout = flood_control(request) + + if form.is_valid() and not flood: + topic2 = form.cleaned_data['topic2'] + for post in Post.objects.filter(topic.id=topic.id): + post.topic.id = topic2.id + + topic.delete() + + return HttpResponseRedirect(topic2.get_absolute_url()) + else: + form = MergeForm(auto_id=True) + + return render_response(request, 'forum/merge.html', locals()) + + at login_required def hide(request, forum_slug, topic_id, post_id=False): forum = get_object_or_404(Forum, slug=forum_slug) topic = get_object_or_404(Topic, pk=topic_id) @@ -232,4 +257,4 @@ timeout = False request.session['flood_control'] = datetime.now() - return flood,timeout + return flood,timeout \ No newline at end of file From oi-commits at pardus.org.tr Sat Nov 10 16:44:58 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 10 Nov 2007 16:44:58 +0200 (EET) Subject: [Oi-commits] r610 - trunk/templates Message-ID: <20071110144459.0730F7C000E@liste.uludag.org.tr> Author: ahmet Date: Sat Nov 10 16:44:58 2007 New Revision: 610 Modified: trunk/templates/base.html Log: Arama kutucu?u Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Sat Nov 10 16:44:58 2007 @@ -69,6 +69,13 @@
Pardus'u indirin
Pardus'u indir..
+
Arama
+
+
+ + +
+
?zg?rl?ki?in'i destekleyin
Pardus'un tan?t?m?na katk?da bulunmak isteyenler i?in ?zg?rl?ki?in d??meleri yay?nland?. Sitenizde, blogunuzda yay?nlamak i?in siz de haz?r kodlar?m?zdan yararlanabilirsiniz.
{% endblock %} From oi-commits at pardus.org.tr Sat Nov 10 16:46:09 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 10 Nov 2007 16:46:09 +0200 (EET) Subject: [Oi-commits] r611 - in branches/stable: . st templates Message-ID: <20071110144609.A43EA7C000E@liste.uludag.org.tr> Author: ahmet Date: Sat Nov 10 16:46:09 2007 New Revision: 611 Added: branches/stable/st/forms.py branches/stable/templates/search.html Modified: branches/stable/st/views.py branches/stable/templates/base.html branches/stable/urls.py Log: transport.. Modified: branches/stable/st/views.py ================================================================= --- branches/stable/st/views.py (original) +++ branches/stable/st/views.py Sat Nov 10 16:46:09 2007 @@ -13,6 +13,8 @@ from oi.settings import WEB_URL, NEWS_IN_HOMEPAGE, PACKAGES_IN_HOMEPAGE, GAMES_IN_HOMEPAGE, FS_IN_HOMEPAGE, HOWTOS_IN_HOMEPAGE +from oi.st.forms import SearchForm + from oi.st.models import * from oi.st.wrappers import render_response from oi.flatpages.models import FlatPage @@ -88,6 +90,7 @@ packages = Package.objects.filter(tags__name__exact=tag) games = Game.objects.filter(tags__name__exact=tag) fs = FS.objects.filter(tags__name__exact=tag) + howto = HowTo.objects.filter(tags__name__exact=tag) flatpages = FlatPage.objects.filter(tags__name__exact=tag) except Tag.DoesNotExist: raise Http404 @@ -108,5 +111,23 @@ web_url = WEB_URL return render_response(request, 'videobox.html', locals()) -def test(request): - return render_response(request, 'test.html') +def search(request): + if request.method == 'POST': + form = SearchForm(request.POST.copy()) + if form.is_valid(): + term = form.cleaned_data['term'] + + searched = True + tags = Tag.objects.filter(name__contains=term) + news = News.objects.filter(tags__name__contains=term) + packages = Package.objects.filter(tags__name__contains=term) + games = Game.objects.filter(tags__name__contains=term) + fs = FS.objects.filter(tags__name__contains=term) + howto = HowTo.objects.filter(tags__name__contains=term) + flatpages = FlatPage.objects.filter(tags__name__contains=term) + total = (tags.count()+news.count()+packages.count()+games.count()+fs.count()+howto.count()+flatpages.count()) + + else: + pass + + return render_response(request, 'search.html', locals()) \ No newline at end of file Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Sat Nov 10 16:46:09 2007 @@ -43,6 +43,13 @@ {% block sidebartop %}
Pardus'u indirin
Pardus'u indir..
+
Arama
+
+
+ + +
+
?zg?rl?ki?in'i destekleyin
Pardus'un tan?t?m?na katk?da bulunmak isteyenler i?in ?zg?rl?ki?in d??meleri yay?nland?. Sitenizde, blogunuzda yay?nlamak i?in siz de haz?r kodlar?m?zdan yararlanabilirsiniz.
{% endblock %} Modified: branches/stable/urls.py ================================================================= --- branches/stable/urls.py (original) +++ branches/stable/urls.py Sat Nov 10 16:46:09 2007 @@ -106,6 +106,9 @@ (r'^etiket/$', 'django.views.generic.list_detail.object_list', dict(tag_dict)), (r'^etiket/(?P.*)/$', 'oi.st.views.tag_detail'), + #Search + (r'^arama/$', 'oi.st.views.search'), + #Download (r'^indir/$', 'oi.st.views.download'), (r'^indir/(?P.*)/surum_notu/$', 'oi.st.views.download_detail_releasenotes'), @@ -122,12 +125,9 @@ #Bug tracker (r'^bocuk/', include('oi.bug.urls')), - #Gezegen + #Planet (r'^gezegen/', include('oi.feedjack.urls')), - #FIXME: Delete this when development ends - (r'^test/$', 'oi.st.views.test'), - #Django (r'^$', 'oi.st.views.home'), (r'^admin/upload/image/add/$', 'oi.upload.views.image_upload'), From oi-commits at pardus.org.tr Sat Nov 10 16:50:10 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 10 Nov 2007 16:50:10 +0200 (EET) Subject: [Oi-commits] r612 - branches/stable/templates trunk/templates Message-ID: <20071110145010.772967C000E@liste.uludag.org.tr> Author: ahmet Date: Sat Nov 10 16:50:10 2007 New Revision: 612 Modified: branches/stable/templates/base.html trunk/templates/base.html Log: d?zelt Modified: branches/stable/templates/base.html ================================================================= --- branches/stable/templates/base.html (original) +++ branches/stable/templates/base.html Sat Nov 10 16:50:10 2007 @@ -45,7 +45,7 @@
Pardus'u indir..
Arama
-
+
Modified: trunk/templates/base.html ================================================================= --- trunk/templates/base.html (original) +++ trunk/templates/base.html Sat Nov 10 16:50:10 2007 @@ -71,7 +71,7 @@
Pardus'u indir..
Arama
-
+
From oi-commits at pardus.org.tr Sat Nov 10 17:30:12 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Sat, 10 Nov 2007 17:30:12 +0200 (EET) Subject: [Oi-commits] r613 - branches/stable/st Message-ID: <20071110153012.AF2087C000E@liste.uludag.org.tr> Author: ahmet Date: Sat Nov 10 17:30:12 2007 New Revision: 613 Modified: branches/stable/st/views.py Log: eski django :( Modified: branches/stable/st/views.py ================================================================= --- branches/stable/st/views.py (original) +++ branches/stable/st/views.py Sat Nov 10 17:30:12 2007 @@ -115,7 +115,7 @@ if request.method == 'POST': form = SearchForm(request.POST.copy()) if form.is_valid(): - term = form.cleaned_data['term'] + term = form.clean_data['term'] searched = True tags = Tag.objects.filter(name__contains=term) @@ -130,4 +130,4 @@ else: pass - return render_response(request, 'search.html', locals()) \ No newline at end of file + return render_response(request, 'search.html', locals()) From oi-commits at pardus.org.tr Thu Nov 15 13:42:55 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Thu, 15 Nov 2007 13:42:55 +0200 (EET) Subject: [Oi-commits] r614 - trunk/st Message-ID: <20071115114255.E8A4B7C000E@liste.uludag.org.tr> Author: ahmet Date: Thu Nov 15 13:42:55 2007 New Revision: 614 Modified: trunk/st/views.py Log: case insensitive Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Thu Nov 15 13:42:55 2007 @@ -118,16 +118,22 @@ term = form.cleaned_data['term'] searched = True - tags = Tag.objects.filter(name__contains=term) - news = News.objects.filter(tags__name__contains=term) - packages = Package.objects.filter(tags__name__contains=term) - games = Game.objects.filter(tags__name__contains=term) - fs = FS.objects.filter(tags__name__contains=term) - howto = HowTo.objects.filter(tags__name__contains=term) - flatpages = FlatPage.objects.filter(tags__name__contains=term) - total = (tags.count()+news.count()+packages.count()+games.count()+fs.count()+howto.count()+flatpages.count()) + tags = Tag.objects.filter(name__icontains=term) + news = News.objects.filter(tags__name__icontains=term) + packages = Package.objects.filter(tags__name__icontains=term) + games = Game.objects.filter(tags__name__icontains=term) + fs = FS.objects.filter(tags__name__icontains=term) + howto = HowTo.objects.filter(tags__name__icontains=term) + flatpages = FlatPage.objects.filter(tags__name__icontains=term) + total = tags.count() + total += news.count() + total += packages.count() + total += games.count() + total += fs.count() + total += howto.count() + total += flatpages.count() else: pass - return render_response(request, 'search.html', locals()) \ No newline at end of file + return render_response(request, 'search.html', locals()) From oi-commits at pardus.org.tr Fri Nov 30 15:41:32 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 30 Nov 2007 15:41:32 +0200 (EET) Subject: [Oi-commits] r615 - branches/stable/st Message-ID: <20071130134132.467607C0027@liste.uludag.org.tr> Author: ahmet Date: Fri Nov 30 15:41:31 2007 New Revision: 615 Modified: branches/stable/st/views.py Log: Case insensitive search. Modified: branches/stable/st/views.py ================================================================= --- branches/stable/st/views.py (original) +++ branches/stable/st/views.py Fri Nov 30 15:41:31 2007 @@ -115,17 +115,23 @@ if request.method == 'POST': form = SearchForm(request.POST.copy()) if form.is_valid(): - term = form.clean_data['term'] + term = form.cleaned_data['term'] searched = True - tags = Tag.objects.filter(name__contains=term) - news = News.objects.filter(tags__name__contains=term) - packages = Package.objects.filter(tags__name__contains=term) - games = Game.objects.filter(tags__name__contains=term) - fs = FS.objects.filter(tags__name__contains=term) - howto = HowTo.objects.filter(tags__name__contains=term) - flatpages = FlatPage.objects.filter(tags__name__contains=term) - total = (tags.count()+news.count()+packages.count()+games.count()+fs.count()+howto.count()+flatpages.count()) + tags = Tag.objects.filter(name__icontains=term) + news = News.objects.filter(tags__name__icontains=term) + packages = Package.objects.filter(tags__name__icontains=term) + games = Game.objects.filter(tags__name__icontains=term) + fs = FS.objects.filter(tags__name__icontains=term) + howto = HowTo.objects.filter(tags__name__icontains=term) + flatpages = FlatPage.objects.filter(tags__name__icontains=term) + total = tags.count() + total += news.count() + total += packages.count() + total += games.count() + total += fs.count() + total += howto.count() + total += flatpages.count() else: pass From oi-commits at pardus.org.tr Fri Nov 30 16:09:27 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 30 Nov 2007 16:09:27 +0200 (EET) Subject: [Oi-commits] r616 - in trunk: st templates Message-ID: <20071130140927.9BCD67C000E@liste.uludag.org.tr> Author: ahmet Date: Fri Nov 30 16:09:27 2007 New Revision: 616 Modified: trunk/st/views.py trunk/templates/search.html Log: some corrections. Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Fri Nov 30 16:09:27 2007 @@ -118,13 +118,13 @@ term = form.cleaned_data['term'] searched = True - tags = Tag.objects.filter(name__icontains=term) - news = News.objects.filter(tags__name__icontains=term) - packages = Package.objects.filter(tags__name__icontains=term) - games = Game.objects.filter(tags__name__icontains=term) - fs = FS.objects.filter(tags__name__icontains=term) - howto = HowTo.objects.filter(tags__name__icontains=term) - flatpages = FlatPage.objects.filter(tags__name__icontains=term) + tags = Tag.objects.filter(name__icontains=term).order_by('name') + news = News.objects.filter(tags__name__icontains=term).order_by('-update') + packages = Package.objects.filter(tags__name__icontains=term).order_by('-update') + games = Game.objects.filter(tags__name__icontains=term).order_by('-update') + fs = FS.objects.filter(tags__name__icontains=term).order_by('-update') + howto = HowTo.objects.filter(tags__name__icontains=term).order_by('-update') + flatpages = FlatPage.objects.filter(tags__name__icontains=term).order_by('name') total = tags.count() total += news.count() total += packages.count() Modified: trunk/templates/search.html ================================================================= --- trunk/templates/search.html (original) +++ trunk/templates/search.html Fri Nov 30 16:09:27 2007 @@ -16,7 +16,7 @@

Haberler ({{ news.count }} adet)

From oi-commits at pardus.org.tr Fri Nov 30 16:10:12 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 30 Nov 2007 16:10:12 +0200 (EET) Subject: [Oi-commits] r617 - in branches/stable: st templates Message-ID: <20071130141012.D91817C000E@liste.uludag.org.tr> Author: ahmet Date: Fri Nov 30 16:10:12 2007 New Revision: 617 Modified: branches/stable/st/views.py branches/stable/templates/search.html Log: noliy Modified: branches/stable/st/views.py ================================================================= --- branches/stable/st/views.py (original) +++ branches/stable/st/views.py Fri Nov 30 16:10:12 2007 @@ -118,13 +118,13 @@ term = form.cleaned_data['term'] searched = True - tags = Tag.objects.filter(name__icontains=term) - news = News.objects.filter(tags__name__icontains=term) - packages = Package.objects.filter(tags__name__icontains=term) - games = Game.objects.filter(tags__name__icontains=term) - fs = FS.objects.filter(tags__name__icontains=term) - howto = HowTo.objects.filter(tags__name__icontains=term) - flatpages = FlatPage.objects.filter(tags__name__icontains=term) + tags = Tag.objects.filter(name__icontains=term).order_by('name') + news = News.objects.filter(tags__name__icontains=term).order_by('-update') + packages = Package.objects.filter(tags__name__icontains=term).order_by('-update') + games = Game.objects.filter(tags__name__icontains=term).order_by('-update') + fs = FS.objects.filter(tags__name__icontains=term).order_by('-update') + howto = HowTo.objects.filter(tags__name__icontains=term).order_by('-update') + flatpages = FlatPage.objects.filter(tags__name__icontains=term).order_by('name') total = tags.count() total += news.count() total += packages.count() Modified: branches/stable/templates/search.html ================================================================= --- branches/stable/templates/search.html (original) +++ branches/stable/templates/search.html Fri Nov 30 16:10:12 2007 @@ -16,7 +16,7 @@

Haberler ({{ news.count }} adet)

From oi-commits at pardus.org.tr Fri Nov 30 16:11:24 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 30 Nov 2007 16:11:24 +0200 (EET) Subject: [Oi-commits] r618 - branches/stable/st Message-ID: <20071130141124.3DDB47C000E@liste.uludag.org.tr> Author: ahmet Date: Fri Nov 30 16:11:23 2007 New Revision: 618 Modified: branches/stable/st/views.py Log: cdd Modified: branches/stable/st/views.py ================================================================= --- branches/stable/st/views.py (original) +++ branches/stable/st/views.py Fri Nov 30 16:11:23 2007 @@ -115,7 +115,7 @@ if request.method == 'POST': form = SearchForm(request.POST.copy()) if form.is_valid(): - term = form.cleaned_data['term'] + term = form.clean_data['term'] searched = True tags = Tag.objects.filter(name__icontains=term).order_by('name') @@ -124,7 +124,7 @@ games = Game.objects.filter(tags__name__icontains=term).order_by('-update') fs = FS.objects.filter(tags__name__icontains=term).order_by('-update') howto = HowTo.objects.filter(tags__name__icontains=term).order_by('-update') - flatpages = FlatPage.objects.filter(tags__name__icontains=term).order_by('name') + flatpages = FlatPage.objects.filter(tags__name__icontains=term).order_by('title') total = tags.count() total += news.count() total += packages.count() From oi-commits at pardus.org.tr Fri Nov 30 16:14:10 2007 From: oi-commits at pardus.org.tr (oi-commits at pardus.org.tr) Date: Fri, 30 Nov 2007 16:14:10 +0200 (EET) Subject: [Oi-commits] r619 - trunk/st Message-ID: <20071130141410.2E6247C000E@liste.uludag.org.tr> Author: ahmet Date: Fri Nov 30 16:14:09 2007 New Revision: 619 Modified: trunk/st/views.py Log: ddc Modified: trunk/st/views.py ================================================================= --- trunk/st/views.py (original) +++ trunk/st/views.py Fri Nov 30 16:14:09 2007 @@ -124,7 +124,7 @@ games = Game.objects.filter(tags__name__icontains=term).order_by('-update') fs = FS.objects.filter(tags__name__icontains=term).order_by('-update') howto = HowTo.objects.filter(tags__name__icontains=term).order_by('-update') - flatpages = FlatPage.objects.filter(tags__name__icontains=term).order_by('name') + flatpages = FlatPage.objects.filter(tags__name__icontains=term).order_by('title') total = tags.count() total += news.count() total += packages.count()