diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2021-04-30 21:32:53 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2021-04-30 21:32:53 +0100 |
| commit | be0148d146263140961e3e47dccd54bc28827e0a (patch) | |
| tree | f8b0cff33f2ca300d0fbf0d3125d816b379e0686 /core/views | |
| parent | 8f1d6e2cc22563bd4fca94f5e7e08085154e8262 (diff) | |
| download | troggle-be0148d146263140961e3e47dccd54bc28827e0a.tar.gz troggle-be0148d146263140961e3e47dccd54bc28827e0a.tar.bz2 troggle-be0148d146263140961e3e47dccd54bc28827e0a.zip | |
removing cruft, renaming badly named things
Diffstat (limited to 'core/views')
| -rw-r--r-- | core/views/caves.py | 2 | ||||
| -rw-r--r-- | core/views/logbooks.py | 4 | ||||
| -rw-r--r-- | core/views/other.py | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index b7143cc..229aa57 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -354,7 +354,7 @@ def edit_cave(request, slug=None): #versionControlForm = VersionControlCommentForm() return render(request, - 'editcave2.html', + 'editcave.html', {'form': form, 'cave': cave, 'message': message, 'caveAndEntranceFormSet': ceFormSet, #'versionControlForm': versionControlForm diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 3181a33..2ec6991 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -31,7 +31,7 @@ It uses the global object TROG to hold some cached pages. todo = '''Fix the get_person_chronology() display bug. ''' -def personindex(request): +def notablepersons(request): persons = Person.objects.all() # From what I can tell, "persons" seems to be the table rows, while "pcols" is the table columns. - AC 16 Feb 09 pcols = [ ] @@ -45,7 +45,7 @@ def personindex(request): if person.bisnotable(): notablepersons.append(person) - return render(request,'personindex.html', {'persons': persons, 'pcols':pcols, 'notablepersons':notablepersons}) + return render(request,'notablepersons.html', {'persons': persons, 'pcols':pcols, 'notablepersons':notablepersons}) def expedition(request, expeditionname): diff --git a/core/views/other.py b/core/views/other.py index c721a61..d3d1126 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -33,10 +33,6 @@ todo = ''' When we have done all the old logbooks, delete this function and the two templates. - But how does this interact with troggle/logbooksdump.py ? - -- deleted newfile() - check on deleted UploadFileForm using the editfile.html template which is about re-submitting - a LBE aka TripReport - ''' def todos(request, module): @@ -214,7 +210,7 @@ def scanupload(request, wallet=None): ''' filesaved = False actual_saved = [] - print(f'! - FORM scanupload - start {wallet}') + # print(f'! - FORM scanupload - start {wallet}') if wallet is None: wallet = "2021#01" # improve this later if not re.match('(19|20)\d\d:\d\d', wallet): @@ -248,12 +244,12 @@ def scanupload(request, wallet=None): if multiple: for f in multiple: actual_saved.append( fs.save(f.name, content=f) ) - print(f'! - FORM scanupload multiple {actual_saved}') + # print(f'! - FORM scanupload multiple {actual_saved}') filesaved = True files = [] dirs = [] - print(f'! - FORM scanupload - start {wallet} {dirpath}') + # print(f'! - FORM scanupload - start {wallet} {dirpath}') try: for f in dirpath.iterdir(): if f.is_dir(): |