matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed comments app to document_comments to avoid conflics with django comments app

Browse Source
This commit is contained in:
Roberto Rosario
2011-05-01 16:08:34 -04:00
parent 4fffefd367
commit e69a85efad
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/comments/urls.py
View File

@@ -1,6 +1,6 @@
from django.conf.urls.defaults import patterns, url from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('comments.views', urlpatterns = patterns('document_comments.views',
url(r'^(?P<comment_id>\d+)/delete/$', 'comment_delete', (), 'comment_delete'), url(r'^(?P<comment_id>\d+)/delete/$', 'comment_delete', (), 'comment_delete'),
url(r'^multiple/delete/$', 'comment_multiple_delete', (), 'comment_multiple_delete'), url(r'^multiple/delete/$', 'comment_multiple_delete', (), 'comment_multiple_delete'),
url(r'^add_to_document(?P<document_id>\d+)/$', 'comment_add', (), 'comment_add'), url(r'^add_to_document(?P<document_id>\d+)/$', 'comment_add', (), 'comment_add'),

2
apps/comments/utils.py
View File

@@ -1,6 +1,6 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.contrib.comments.models import Comment from django.contrib.comments.models import Comment
from comments import comment_delete from document_comments import comment_delete
def get_comments_subtemplate(obj): def get_comments_subtemplate(obj):

4
apps/comments/views.py
View File

@@ -10,8 +10,8 @@ from django.contrib.sites.models import Site
from permissions.api import check_permissions from permissions.api import check_permissions
from documents.models import Document from documents.models import Document
from comments import PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_CREATE from document_comments import PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_CREATE
from comments.forms import CommentForm from document_comments.forms import CommentForm
def comment_delete(request, comment_id=None, comment_id_list=None): def comment_delete(request, comment_id=None, comment_id_list=None):

2
settings.py
View File

@@ -142,7 +142,7 @@ INSTALLED_APPS = (
'folders', 'folders',
'taggit', 'taggit',
'tags', 'tags',
'comments', 'document_comments',
) )
TEMPLATE_CONTEXT_PROCESSORS = ( TEMPLATE_CONTEXT_PROCESSORS = (