diff --git a/rowers/models.py b/rowers/models.py index d83218bd..ecf5e2bb 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2420,6 +2420,7 @@ class PlannedSession(models.Model): file = tempfile.NamedTemporaryFile(mode='w+b',suffix='.fit',dir=settings.MEDIA_ROOT) filename = file + steps = self.steps try: @@ -2433,9 +2434,12 @@ class PlannedSession(models.Model): self.steps = steps fitfile = steps_write_fit(steps) + filelist = fitfile.split('/media/') + self.fitfile.name = filelist[-1] + # calculate approximate distance if self.steps: sdict, totalmeters, totalseconds = ps_dict_order(self.steps) diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html index 96050549..3e6bf769 100644 --- a/rowers/templates/plannedsessionedit.html +++ b/rowers/templates/plannedsessionedit.html @@ -121,6 +121,7 @@ Name Value   + Edit Delete @@ -138,8 +139,11 @@ {{ ps.sessionvalue }} {{ ps.sessionunit }} + + + - Delete + Delete {% endfor %} diff --git a/rowers/templates/plannedsessiontemplateedit.html b/rowers/templates/plannedsessiontemplateedit.html index d063cf6c..dc84e128 100644 --- a/rowers/templates/plannedsessiontemplateedit.html +++ b/rowers/templates/plannedsessiontemplateedit.html @@ -28,7 +28,7 @@

- Delete + Delete

@@ -65,10 +65,10 @@ {{ ps.sessionvalue }} {{ ps.sessionunit }} - Edit Library Session + - Delete + {% endfor %} diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html index 5a3ccf5b..e4097cc6 100644 --- a/rowers/templates/plannedsessionview.html +++ b/rowers/templates/plannedsessionview.html @@ -15,9 +15,9 @@ {% if user.is_authenticated and psdict.id.1|is_session_manager:user %}

- Edit Session + Edit Session / - Save to Library + Save to Library

{% endif %}

Session {{ psdict.name.1 }}

diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index be2130df..40f9fd6a 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -2235,14 +2235,7 @@ class PlannedSessionDelete(DeleteView): w.plannedsession = None w.save() - if self.object.fitfile: - filelist = self.object.fitfile.name.split('/media') - filename = settings.MEDIA_ROOT+'/'+filelist[-1] - try: - os.remove(filename) - except FileNotFoundError: - print(filename) - self.object.fitfile = None + url = reverse(plannedsessions_view) next = self.request.GET.get('next',url)