Make breadcrumbs more consistent

diff --git a/pgcommitfest/commitfest/models.py b/pgcommitfest/commitfest/models.py
index 76c582d048fce8df2225683824af694494468aa8..39e2d34dad8635b5b846c0335b47671c6723ebdc 100644 (file)
--- a/pgcommitfest/commitfest/models.py
+++ b/pgcommitfest/commitfest/models.py
@@ -39,6 +39,10 @@ class CommitFest(models.Model):
        def statusstring(self):
                return [v for k,v in self._STATUS_CHOICES if k==self.status][0]
 
+       @property
+       def title(self):
+               return "Commitfest %s" % self.name
+
        @property
        def isopen(self):
                return self.status == self.STATUS_OPEN

diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index 6a72b93adc2d359d6e62395df0468950ff47a976..650b29cbfd589337b6794a3c10682136e4748b04 100644 (file)
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -98,7 +98,7 @@ def commitfest(request, cfid):
                'form': form,
                'patches': patches,
                'has_filter': has_filter,
-               'title': 'Commitfest %s' % cf.name,
+               'title': cf.title,
                'grouping': sortkey==0,
                'sortkey': sortkey,
                }, context_instance=RequestContext(request))
@@ -133,7 +133,7 @@ def patch(request, cfid, patchid):
                'is_this_committer': is_this_committer,
                'is_reviewer': is_reviewer,
                'title': 'View patch',
-               'breadcrumbs': [{'title': cf.name, 'href': '/%s/' % cf.pk},],
+               'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},],
                }, context_instance=RequestContext(request))
 
 @login_required
@@ -166,7 +166,7 @@ def patchform(request, cfid, patchid):
                'form': form,
                'patch': patch,
                'title': 'Edit patch',
-               'breadcrumbs': [{'title': cf.name, 'href': '/%s/' % cf.pk},
+               'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},
                                                {'title': 'View patch', 'href': '/%s/%s/' % (cf.pk, patch.pk)}],
        }, context_instance=RequestContext(request))
 
@@ -203,7 +203,7 @@ def newpatch(request, cfid):
        return render_to_response('base_form.html', {
                'form': form,
                'title': 'New patch',
-               'breadcrumbs': [{'title': cf.name, 'href': '/%s/' % cf.pk},],
+               'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},],
                'savebutton': 'Create patch',
                'threadbrowse': True,
        }, context_instance=RequestContext(request))
@@ -288,7 +288,7 @@ def comment(request, cfid, patchid, what):
                'form': form,
                'patch': patch,
                'extraformclass': 'patchcommentform',
-               'breadcrumbs': [{'title': cf.name, 'href': '/%s/' % cf.pk},
+               'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},
                                                {'title': 'View patch', 'href': '/%s/%s/' % (cf.pk, patch.pk)}],
                'title': "Add %s" % what,
                'note': '<b>Note!</b> This form will generate an email to the public mailinglist <i>pgsql-hackers</i>, with sender set to %s!' % (request.user.email),