summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Willemsen <tom.willemsen@archlinux.us>2011-04-28 12:43:01 -0500
committerDan McGee <dan@archlinux.org>2011-04-28 14:00:54 -0500
commitc5a28f88936fba06755aefec61a017c2ce94ba40 (patch)
tree76add6504dff0e7f882b151094b607bc5b5b8be8
parentc292dcfc6bf96ebf5f34342beb1367aa5361f7c4 (diff)
downloadarchweb-c5a28f88936fba06755aefec61a017c2ce94ba40.tar.gz
archweb-c5a28f88936fba06755aefec61a017c2ce94ba40.zip
isotests: modelines, imports, url and pass
* Added vim modelines to files. * Rearranged import statements. * Moved the arch releng isos url to settings.py. * Fixed some issues that arose from forgetting to import the isotests urls package. * removed redundant str() calls. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--isotests/admin.py5
-rw-r--r--isotests/models.py2
-rw-r--r--isotests/views.py2
-rw-r--r--settings.py3
-rw-r--r--urls.py3
5 files changed, 13 insertions, 2 deletions
diff --git a/isotests/admin.py b/isotests/admin.py
index 0cde0f83..17303c58 100644
--- a/isotests/admin.py
+++ b/isotests/admin.py
@@ -1,7 +1,8 @@
+from django.contrib import admin
+
from isotests.models import Iso, Architecture, IsoType, BootType
from isotests.models import HardwareType, InstallType, Source
from isotests.models import ClockChoice, Filesystem, Module, Bootloader
-from django.contrib import admin
admin.site.register(Iso)
admin.site.register(Architecture)
@@ -14,3 +15,5 @@ admin.site.register(ClockChoice)
admin.site.register(Filesystem)
admin.site.register(Module)
admin.site.register(Bootloader)
+
+# vim: set ts=4 sw=4 et:
diff --git a/isotests/models.py b/isotests/models.py
index ae5bf96f..7b7eb5e7 100644
--- a/isotests/models.py
+++ b/isotests/models.py
@@ -109,3 +109,5 @@ class Test(models.Model):
bootloader = models.ForeignKey(Bootloader)
success = models.BooleanField()
comments = models.TextField(null=True, blank=True)
+
+# vim: set ts=4 sw=4 et:
diff --git a/isotests/views.py b/isotests/views.py
index 61d95e54..dd041ebc 100644
--- a/isotests/views.py
+++ b/isotests/views.py
@@ -108,3 +108,5 @@ def view_results_for(request, option, value):
def thanks(request):
return direct_to_template(request, "isotests/thanks.html", None)
+
+# vim: set ts=4 sw=4 et:
diff --git a/settings.py b/settings.py
index 107baa17..d4d3d96b 100644
--- a/settings.py
+++ b/settings.py
@@ -124,4 +124,7 @@ if DEBUG_TOOLBAR:
INSTALLED_APPS = list(INSTALLED_APPS) + [ 'debug_toolbar' ]
+# rtf settings
+ISOLISTURL = 'http://releng.archlinux.org/isos/'
+
# vim: set ts=4 sw=4 et:
diff --git a/urls.py b/urls.py
index cc8b593a..cc8e2471 100644
--- a/urls.py
+++ b/urls.py
@@ -77,11 +77,12 @@ urlpatterns += patterns('',
(r'^opensearch/packages/$', 'packages.views.opensearch',
{}, 'opensearch-packages'),
(r'^todolists/$','todolists.views.public_list'),
+ (r'^isotests/', include('isotests.urls')),
)
if settings.DEBUG == True:
urlpatterns += patterns('',
- (r'^media/(.*)$', 'django.views.static.serve',
+ (r'^media/(.*)$', 'django.views.static.serve',
{'document_root': os.path.join(settings.DEPLOY_PATH, 'media')}))
# vim: set ts=4 sw=4 et: