diff options
Diffstat (limited to 'core/views')
| -rw-r--r-- | core/views/caves.py | 7 | ||||
| -rw-r--r-- | core/views/other.py | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index efccd8f..9d77d33 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -18,7 +18,8 @@ import troggle.settings as settings from troggle.core.views import expo from troggle.core.models.troggle import Expedition, DataIssue from troggle.core.models.caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation, GetCaveLookup -from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm +from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, EntranceForm, EntranceLetterForm +#from troggle.core.forms import VersionControlCommentForm from .login import login_required_if_public '''Manages the complex procedures to assemble a cave description out of the compnoents @@ -323,7 +324,7 @@ def edit_cave(request, slug=None): if request.POST: form = CaveForm(request.POST, instance=cave) ceFormSet = CaveAndEntranceFormSet(request.POST) - versionControlForm = VersionControlCommentForm(request.POST) + #versionControlForm = VersionControlCommentForm(request.POST) if form.is_valid() and ceFormSet.is_valid(): #print(f'! POST is valid. {cave}') cave = form.save(commit = False) @@ -397,8 +398,6 @@ def edit_entrance(request, caveslug=None, slug=None): slugname = cave.slug() + entletter.cleaned_data["entrance_letter"] else: slugname = cave.slug() - # Converting a PENDING cave to a real cave by saving this form - slugname = slugname.replace('-PENDING-', '-') entrance.cached_primary_slug = slugname entrance.filename = slugname + ".html" entrance.save() diff --git a/core/views/other.py b/core/views/other.py index 45d781c..c864593 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -32,7 +32,7 @@ todo = ''' - But how does this interact with troggle/logbooksdump.py ? -- deleted nefile() - check on deleted UploadFileForm using the editfile.html template which is about re-submitting +- deleted newfile() - check on deleted UploadFileForm using the editfile.html template which is about re-submitting a LBE aka TripReport ''' @@ -44,12 +44,16 @@ def todos(request, module): from troggle.core.TESTS.tests import todo as tests from troggle.core.views.logbooks import todo as viewlogbooks from troggle.parsers.logbooks import todo as parserslogbooks + from troggle.parsers.survex import todo as parserssurvex + from troggle.core.models.caves import todo as modelcaves from troggle.core.forms import todo as forms from troggle.core.templatetags.wiki_markup import todo as wiki tododict = {'views/other': todo, 'tests': tests, 'views/logbooks': viewlogbooks, 'parsers/logbooks': parserslogbooks, + 'parsers/survex': parserssurvex, + 'core/models/caves': modelcaves, 'core/forms': forms, 'core/templatetags/wiki_markup': wiki} return render(request,'core/todos.html', {'tododict': tododict}) |