diff options
author | 2016-08-23 13:36:37 +0000 | |
---|---|---|
committer | 2016-08-23 13:36:37 +0000 | |
commit | 8b19eb63a99014cc1c59d05efe2e1fbe5f98a379 (patch) | |
tree | 7bdec8c03b61122474416d30a3c6d1eba603c702 /tools/pharos-dashboard/booking/models.py | |
parent | f94c874069cfaef0f59c92c903876ce3d488e2b0 (diff) | |
parent | 6c993d9e3bd9a7c0fb94d7056e664648dd8d85cb (diff) |
Merge changes from topic 'pharos-dashboard'
* changes:
Create Jira issue for new booking
Remove database migration files
Diffstat (limited to 'tools/pharos-dashboard/booking/models.py')
-rw-r--r-- | tools/pharos-dashboard/booking/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/pharos-dashboard/booking/models.py b/tools/pharos-dashboard/booking/models.py index 719dd9bf..8011fa41 100644 --- a/tools/pharos-dashboard/booking/models.py +++ b/tools/pharos-dashboard/booking/models.py @@ -10,6 +10,7 @@ class Booking(models.Model): resource = models.ForeignKey(Resource, models.PROTECT) start = models.DateTimeField() end = models.DateTimeField() + jira_issue_id = models.IntegerField(null=True) purpose = models.CharField(max_length=300, blank=False) @@ -25,11 +26,10 @@ class Booking(models.Model): if user.has_perm('booking.add_booking'): return True # Check if User owns this resource - if user in self.resource.owners.all(): + if user == self.resource.owner: return True return False - def save(self, *args, **kwargs): """ Save the booking if self.user is authorized and there is no overlapping booking. |