From ee258f7acf4669026ed422bb091eb9f2c72f9b12 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Mon, 14 May 2012 11:46:30 -0400 Subject: [PATCH] Fix place where simplewiki was importing the wrong settings --- djangoapps/simplewiki/views_attachments.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/djangoapps/simplewiki/views_attachments.py b/djangoapps/simplewiki/views_attachments.py index 205f836ab9..e75802413f 100644 --- a/djangoapps/simplewiki/views_attachments.py +++ b/djangoapps/simplewiki/views_attachments.py @@ -3,14 +3,21 @@ import os from django.contrib.auth.decorators import login_required from django.core.servers.basehttp import FileWrapper from django.db.models.fields.files import FieldFile -from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404 +from django.http import HttpResponse, HttpResponseForbidden, Http404 from django.template import loader, Context -from settings import * # TODO: Clean up -from models import Article, ArticleAttachment, get_attachment_filepath -from views import not_found, check_permissions, get_url_path, fetch_from_url +from models import ArticleAttachment, get_attachment_filepath +from views import check_permissions, fetch_from_url -from simplewiki.settings import WIKI_ALLOW_ANON_ATTACHMENTS +from wiki_settings import ( + WIKI_ALLOW_ANON_ATTACHMENTS, + WIKI_ALLOW_ATTACHMENTS, + WIKI_ATTACHMENTS_MAX, + WIKI_ATTACHMENTS_ROOT, + WIKI_ATTACHMENTS_ALLOWED_EXTENSIONS, + WIKI_REQUIRE_LOGIN_VIEW, + WIKI_REQUIRE_LOGIN_EDIT, +) def add_attachment(request, wiki_url):