diff options
| author | Magnus Hagander | 2019-01-17 19:47:43 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2019-01-17 19:47:43 +0000 |
| commit | 0883ac6423857246cca412c159af7914ad06e631 (patch) | |
| tree | d6bdc96b342301b97858f409873f66b030c76490 /pgweb/docs | |
| parent | 87237f6536a1e6df112ca34818cf8459cb04fc68 (diff) | |
Fix whitespace and indentation, per pep8
Diffstat (limited to 'pgweb/docs')
| -rw-r--r-- | pgweb/docs/forms.py | 3 | ||||
| -rw-r--r-- | pgweb/docs/models.py | 4 | ||||
| -rw-r--r-- | pgweb/docs/struct.py | 4 | ||||
| -rw-r--r-- | pgweb/docs/views.py | 23 |
4 files changed, 25 insertions, 9 deletions
diff --git a/pgweb/docs/forms.py b/pgweb/docs/forms.py index c26695ff..96df3a7d 100644 --- a/pgweb/docs/forms.py +++ b/pgweb/docs/forms.py @@ -1,8 +1,9 @@ from django import forms + class DocCommentForm(forms.Form): name = forms.CharField(max_length=100, required=True, label='Your Name') email = forms.EmailField(max_length=100, required=True, label='Your Email') shortdesc = forms.CharField(max_length=100, required=True, label="Subject") details = forms.CharField(required=True, widget=forms.Textarea, - label="What is your comment?") + label="What is your comment?") diff --git a/pgweb/docs/models.py b/pgweb/docs/models.py index 7a522147..2e612417 100644 --- a/pgweb/docs/models.py +++ b/pgweb/docs/models.py @@ -1,6 +1,7 @@ from django.db import models from pgweb.core.models import Version + class DocPage(models.Model): id = models.AutoField(null=False, primary_key=True) file = models.CharField(max_length=64, null=False, blank=False) @@ -20,6 +21,7 @@ class DocPage(models.Model): # Index file first, because we want to list versions by file unique_together = [('file', 'version')] + class DocPageAlias(models.Model): file1 = models.CharField(max_length=64, null=False, blank=False, unique=True) file2 = models.CharField(max_length=64, null=False, blank=False, unique=True) @@ -30,4 +32,4 @@ class DocPageAlias(models.Model): # XXX: needs a unique functional index as well, see the migration! class Meta: db_table = 'docsalias' - verbose_name_plural='Doc page aliases' + verbose_name_plural = 'Doc page aliases' diff --git a/pgweb/docs/struct.py b/pgweb/docs/struct.py index 942d0573..78c3f933 100644 --- a/pgweb/docs/struct.py +++ b/pgweb/docs/struct.py @@ -1,6 +1,7 @@ from django.db import connection from pgweb.core.models import Version + def get_struct(): currentversion = Version.objects.get(current=True) @@ -31,7 +32,7 @@ def get_struct(): version = int(version) yield ('docs/%s/%s' % (version, filename), - testing and 0.1 or docprio, # beta/rc versions always get 0.1 in prio + testing and 0.1 or docprio, # beta/rc versions always get 0.1 in prio loaded) # Also yield the current version urls, with the highest @@ -40,6 +41,7 @@ def get_struct(): yield ('docs/current/%s' % filename, 1.0, loaded) + # For our internal sitemap (used only by our own search engine), # include the devel version of the docs (and only those, since the # other versions are already included) diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py index d0936272..3934e568 100644 --- a/pgweb/docs/views.py +++ b/pgweb/docs/views.py @@ -17,6 +17,7 @@ from pgweb.core.models import Version from models import DocPage from forms import DocCommentForm + @allow_frames @content_sources('style', "'unsafe-inline'") def docpage(request, version, filename): @@ -57,9 +58,9 @@ def docpage(request, version, filename): where=["file=%s OR file IN (SELECT file2 FROM docsalias WHERE file1=%s) OR file IN (SELECT file1 FROM docsalias WHERE file2=%s)"], params=[fullname, fullname, fullname], select={ - 'supported':"COALESCE((SELECT supported FROM core_version v WHERE v.tree=version), 'f')", - 'testing':"COALESCE((SELECT testing FROM core_version v WHERE v.tree=version),0)", - }).order_by('-supported', 'version').only('version', 'file') + 'supported': "COALESCE((SELECT supported FROM core_version v WHERE v.tree=version), 'f')", + 'testing': "COALESCE((SELECT testing FROM core_version v WHERE v.tree=version),0)", + }).order_by('-supported', 'version').only('version', 'file') return render(request, 'docs/docspage.html', { 'page': page, @@ -71,6 +72,7 @@ def docpage(request, version, filename): 'loaddate': loaddate, }) + def docspermanentredirect(request, version, typ, page, *args): """Provides a permanent redirect from the old static/interactive pages to the modern pages that do not have said keywords. @@ -80,18 +82,22 @@ def docspermanentredirect(request, version, typ, page, *args): url += page return HttpResponsePermanentRedirect(url) + def docsrootpage(request, version): return docpage(request, version, 'index') + def redirect_root(request, version): return HttpResponsePermanentRedirect("/docs/%s/" % version) + def root(request): - versions = Version.objects.filter(Q(supported=True) | Q(testing__gt=0,tree__gt=0)).order_by('-tree') + versions = Version.objects.filter(Q(supported=True) | Q(testing__gt=0, tree__gt=0)).order_by('-tree') return render_pgweb(request, 'docs', 'docs/index.html', { 'versions': versions, }) + class _VersionPdfWrapper(object): """ A wrapper around a version that knows to look for PDF files, and @@ -110,26 +116,31 @@ class _VersionPdfWrapper(object): self.indexname = 'postgres.html' else: self.indexname = 'index.html' + def __getattr__(self, name): return getattr(self.__version, name) + def _find_pdf(self, pagetype): try: return os.stat('%s/documentation/pdf/%s/postgresql-%s-%s.pdf' % (settings.STATIC_CHECKOUT, self.__version.numtree, self.__version.numtree, pagetype)).st_size except: return 0 + def manuals(request): - versions = Version.objects.filter(Q(supported=True) | Q(testing__gt=0,tree__gt=0)).order_by('-tree') + versions = Version.objects.filter(Q(supported=True) | Q(testing__gt=0, tree__gt=0)).order_by('-tree') return render_pgweb(request, 'docs', 'docs/manuals.html', { 'versions': [_VersionPdfWrapper(v) for v in versions], }) + def manualarchive(request): - versions = Version.objects.filter(testing=0,supported=False,tree__gt=0).order_by('-tree') + versions = Version.objects.filter(testing=0, supported=False, tree__gt=0).order_by('-tree') return render_pgweb(request, 'docs', 'docs/archive.html', { 'versions': [_VersionPdfWrapper(v) for v in versions], }) + @login_required def commentform(request, itemid, version, filename): v = get_object_or_404(Version, tree=version) |
