Code cleanup

This commit is contained in:
Roberto Rosario
2011-07-21 11:46:15 -04:00
parent 46aa89d924
commit 90e876ca93
36 changed files with 125 additions and 169 deletions

View File

@@ -29,6 +29,7 @@ if common_settings.AUTO_CREATE_ADMIN:
# the "syncdb" command during database creation.)
#
# Create our own test user automatically.
def create_testuser(app, created_models, verbosity, **kwargs):
USERNAME = common_settings.AUTO_ADMIN_USERNAME
PASSWORD = common_settings.AUTO_ADMIN_PASSWORD

View File

@@ -111,4 +111,3 @@ class UserForm(forms.ModelForm):
class Meta:
model = User
fields = ('first_name', 'last_name')

View File

@@ -20,7 +20,7 @@ except:
import mimetypes
mimetypes.init()
USE_PYTHON_MAGIC = False
def urlquote(link=None, get=None):
u'''
@@ -357,7 +357,7 @@ def get_mimetype(filepath):
"""
file_mimetype = u''
file_mime_encoding = u''
if USE_PYTHON_MAGIC:
if os.path.exists(filepath):
try:
@@ -373,7 +373,7 @@ def get_mimetype(filepath):
else:
path, filename = os.path.split(filepath)
file_mimetype, file_mime_encoding = mimetypes.guess_type(filename)
return file_mimetype, file_mime_encoding
@@ -384,7 +384,7 @@ def validate_path(path):
os.mkdir(path)
except:
return False
# Check if it is writable
try:
fd, test_filepath = tempfile.mkstemp(dir=path)
@@ -392,5 +392,5 @@ def validate_path(path):
os.unlink(test_filepath)
except:
return False
return True

View File

@@ -105,7 +105,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
'form': unselected_list,
'title': left_list_title,
'submit_label': _(u'Add'),
'submit_icon_famfam': 'add'
'submit_icon_famfam': 'add'
}
},
{
@@ -145,7 +145,7 @@ def current_user_details(request):
Display the current user's details
"""
form = UserForm_view(instance=request.user)
return render_to_response(
'generic_form.html', {
'form': form,
@@ -153,15 +153,15 @@ def current_user_details(request):
'read_only': True,
},
context_instance=RequestContext(request))
def current_user_edit(request):
"""
Allow an user to edit his own details
"""
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('current_user_details'))))
if request.method == 'POST':
form = UserForm(instance=request.user, data=request.POST)
if form.is_valid():
@@ -170,11 +170,11 @@ def current_user_edit(request):
return HttpResponseRedirect(next)
else:
form = UserForm(instance=request.user)
return render_to_response(
'generic_form.html', {
'form': form,
'next': next,
'title': _(u'edit current user details'),
},
context_instance=RequestContext(request))
context_instance=RequestContext(request))