Skip to content

Commit

Permalink
Removing tag app from sample_group_project and adding tagging_ext ins…
Browse files Browse the repository at this point in the history
…tead
  • Loading branch information
pydanny committed Feb 22, 2010
1 parent 20e2654 commit 5920d27
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 32 deletions.
Empty file.

This file was deleted.

Empty file.

This file was deleted.

4 changes: 2 additions & 2 deletions pinax/projects/sample_group_project/settings.py
Expand Up @@ -179,13 +179,13 @@
"django_filters",
"staticfiles",
"debug_toolbar",
"flag",
"flag",
"tagging_ext",

# internal (for now)
"basic_profiles",
"account",
"signup_codes",
"tag_app",
"tagging_utils",
"threadedcomments_extras",

Expand Down
37 changes: 37 additions & 0 deletions pinax/projects/sample_group_project/urls.py
Expand Up @@ -39,10 +39,47 @@
(r"^groups/", include("basic_groups.urls")),
(r"^tribes/", include("tribes.urls")),
(r"^projects/", include("projects.urls")),
(r"^flag/", include("flag.urls")),

(r"^admin/", include(admin.site.urls)),
)

from tagging.models import TaggedItem

from projects.models import Project
from tasks.models import Task
from topics.models import Topic
from wiki.models import Article as WikiArticle

tagged_models = (
dict(title="Projects",
query=lambda tag: TaggedItem.objects.get_by_model(Project, tag),
),
dict(title="Topics",
query=lambda tag: TaggedItem.objects.get_by_model(Topic, tag),
),
dict(title="Project Tasks",
query=lambda tag: TaggedItem.objects.get_by_model(Task, tag),
),
dict(title="Wiki Articles",
query=lambda tag: TaggedItem.objects.get_by_model(WikiArticle, tag),
),


)
tagging_ext_kwargs = {
'tagged_models':tagged_models,
}

urlpatterns += patterns('',
url(r'^tags/(?P<tag>.+)/(?P<model>.+)$', 'tagging_ext.views.tag_by_model',
kwargs=tagging_ext_kwargs, name='tagging_ext_tag_by_model'),
url(r'^tags/(?P<tag>.+)/$', 'tagging_ext.views.tag',
kwargs=tagging_ext_kwargs, name='tagging_ext_tag'),
url(r'^tags/$', 'tagging_ext.views.index', name='tagging_ext_index'),
)



if settings.SERVE_MEDIA:
urlpatterns += patterns("",
Expand Down

0 comments on commit 5920d27

Please sign in to comment.