Skip to content
Snippets Groups Projects
Commit 34f8c179 authored by Tanner Prestegard's avatar Tanner Prestegard Committed by GraceDB
Browse files

Changing full_filename -> versioned_filename

The "full_filename" property for Log objects is now called the
"versioned_filename" to improve clarity.
parent d5c5ff44
No related branches found
No related tags found
1 merge request!8Superevents
......@@ -240,7 +240,7 @@ class LogBase(models.Model):
ordering = ['-created', '-N']
@property
def full_filename(self):
def versioned_filename(self):
if self.filename:
actual_filename = self.filename
if self.file_version is not None:
......
......@@ -376,7 +376,7 @@ class EventLog(CleanSaveModel, LogBase, AutoIncrementModel):
def fileurl(self):
if self.filename:
return reverse('file-download', args=[self.event.graceid(),
self.full_filename])
self.versioned_filename])
else:
return None
......
......@@ -327,7 +327,7 @@ class SupereventLogSerializer(serializers.ModelSerializer):
link = None
if obj.filename:
link = gracedb_reverse('superevents:superevent-file-detail',
args=[obj.superevent.superevent_id, obj.full_filename],
args=[obj.superevent.superevent_id, obj.versioned_filename],
request=self.context.get('request', None))
return link
......
......@@ -437,11 +437,11 @@ class Log(CleanSaveModel, LogBase, AutoIncrementModel):
unique_together = (('superevent', 'N'),)
def get_full_file_path(self):
return os.path.join(self.superevent.datadir, self.full_filename)
return os.path.join(self.superevent.datadir, self.versioned_filename)
def fileurl(self):
return reverse("superevents:file-download", args=
[self.superevent.superevent_id, self.full_filename])
[self.superevent.superevent_id, self.versioned_filename])
class Labelling(m2mThroughBase):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment