Fix for issue #4. Changed edited by username to standard name format.

This commit is contained in:
Tom Price
2015-01-22 19:31:43 +00:00
parent 5c236819f4
commit 387a7566c7
2 changed files with 5 additions and 6 deletions

View File

@@ -7,7 +7,6 @@ from django.conf import settings
import reversion
# Create your models here.
class Profile(AbstractUser):
initials = models.CharField(max_length=5, unique=True, null=True, blank=True)
@@ -75,7 +74,7 @@ class Organisation(models.Model, RevisionMixin):
if len(self.notes) > 0:
string += "*"
return string
class Meta:
permissions = (
('view_organisation', 'Can view Organisations'),
@@ -131,7 +130,7 @@ class Venue(models.Model, RevisionMixin):
if self.notes and len(self.notes) > 0:
string += "*"
return string
class Meta:
permissions = (
('view_venue', 'Can view Venues'),
@@ -245,7 +244,7 @@ class Event(models.Model, RevisionMixin):
def __str__(self):
return str(self.pk) + ": " + self.name
class Meta:
permissions = (
('view_event', 'Can view Events'),
@@ -286,7 +285,6 @@ class Invoice(models.Model):
void = models.BooleanField()
class Payment(models.Model):
CASH = 'C'
INTERNAL = 'I'

View File

@@ -138,7 +138,8 @@
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
class="glyphicon glyphicon-duplicate"></span></a>
</div>
<div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }} by {{ object.last_edited_by }}.
<div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }}
by {{ object.last_edited_by.name }}.
</div>
</div>
{% endblock %}