mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-26 01:42:16 +00:00
Fix for issue #4. Changed edited by username to standard name format.
This commit is contained in:
@@ -7,7 +7,6 @@ from django.conf import settings
|
|||||||
import reversion
|
import reversion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
class Profile(AbstractUser):
|
class Profile(AbstractUser):
|
||||||
initials = models.CharField(max_length=5, unique=True, null=True, blank=True)
|
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:
|
if len(self.notes) > 0:
|
||||||
string += "*"
|
string += "*"
|
||||||
return string
|
return string
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
permissions = (
|
permissions = (
|
||||||
('view_organisation', 'Can view Organisations'),
|
('view_organisation', 'Can view Organisations'),
|
||||||
@@ -131,7 +130,7 @@ class Venue(models.Model, RevisionMixin):
|
|||||||
if self.notes and len(self.notes) > 0:
|
if self.notes and len(self.notes) > 0:
|
||||||
string += "*"
|
string += "*"
|
||||||
return string
|
return string
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
permissions = (
|
permissions = (
|
||||||
('view_venue', 'Can view Venues'),
|
('view_venue', 'Can view Venues'),
|
||||||
@@ -245,7 +244,7 @@ class Event(models.Model, RevisionMixin):
|
|||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return str(self.pk) + ": " + self.name
|
return str(self.pk) + ": " + self.name
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
permissions = (
|
permissions = (
|
||||||
('view_event', 'Can view Events'),
|
('view_event', 'Can view Events'),
|
||||||
@@ -286,7 +285,6 @@ class Invoice(models.Model):
|
|||||||
void = models.BooleanField()
|
void = models.BooleanField()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Payment(models.Model):
|
class Payment(models.Model):
|
||||||
CASH = 'C'
|
CASH = 'C'
|
||||||
INTERNAL = 'I'
|
INTERNAL = 'I'
|
||||||
|
|||||||
@@ -138,7 +138,8 @@
|
|||||||
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
|
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
|
||||||
class="glyphicon glyphicon-duplicate"></span></a>
|
class="glyphicon glyphicon-duplicate"></span></a>
|
||||||
</div>
|
</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>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
Reference in New Issue
Block a user