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

Updated all apps and widgets with explicit safely marked strings

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-01 20:53:37 -04:00
parent a0b2e5f864
commit f0f0f4fc2e
17 changed files with 119 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/history/views.py
View File

@@ -11,6 +11,7 @@ from permissions.api import check_permissions
from history.models import History
from history.forms import HistoryDetailForm
from history import PERMISSION_HISTORY_VIEW
from history.widgets import history_entry_object_link, history_entry_summary
def history_list(request):
@@ -26,17 +27,11 @@ def history_list(request):
},
{
'name': _(u'object'),
'attribute': lambda x: '<a href="%(url)s">%(label)s</a>' % {
'url': x.content_object.get_absolute_url() if x.content_object else u'#',
'label': unicode(x.content_object) if x.content_object else u''
}
'attribute': lambda x: history_entry_object_link(x)
},
{
'name': _(u'summary'),
'attribute': lambda x: '<a href="%(url)s">%(label)s</a>' % {
'url': x.get_absolute_url(),
'label': unicode(x.get_processed_summary())
}
'attribute': lambda x: history_entry_summary(x)
}
],
'hide_object': True,
@@ -66,10 +61,7 @@ def history_for_object(request, app_label, module_name, object_id):
},
{
'name': _(u'summary'),
'attribute': lambda x: '<a href="%(url)s">%(label)s</a>' % {
'url': x.get_absolute_url(),
'label': unicode(x.get_processed_summary())
}
'attribute': lambda x: history_entry_summary(x)
}
],
'hide_object': True,

16
apps/history/widgets.py Normal file
View File

@@ -0,0 +1,16 @@
from django.utils.safestring import mark_safe
def history_entry_object_link(entry):
return mark_safe(u'<a href="%(url)s">%(label)s</a>' % {
'url': entry.content_object.get_absolute_url() if entry.content_object else u'#',
'label': unicode(entry.content_object) if entry.content_object else u''
}
)
def history_entry_summary(entry):
return mark_safe(u'<a href="%(url)s">%(label)s</a>' % {
'url': entry.get_absolute_url(),
'label': unicode(entry.get_processed_summary())
})