Cleaned up files, removed ununsed imports
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
from django import forms
|
||||
from django.utils.safestring import mark_safe
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.db import models
|
||||
|
||||
@@ -77,7 +76,7 @@ class FilterForm(forms.Form):
|
||||
self.fields[list_filter['name']] = forms.ModelChoiceField(
|
||||
queryset=list_filter['queryset'],
|
||||
label=label[0].upper() + label[1:], required=False)
|
||||
|
||||
|
||||
|
||||
class ChoiceForm(forms.Form):
|
||||
"""
|
||||
|
||||
@@ -317,7 +317,7 @@ def parse_range(astr):
|
||||
x = part.split(u'-')
|
||||
result.update(range(int(x[0]), int(x[-1]) + 1))
|
||||
return sorted(result)
|
||||
|
||||
|
||||
|
||||
def generate_choices_w_labels(choices, display_object_type=True):
|
||||
results = []
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
from django.shortcuts import redirect
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.contrib import messages
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import render_to_response, get_object_or_404
|
||||
from django.shortcuts import render_to_response
|
||||
from django.template import RequestContext
|
||||
from django.contrib import messages
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
|
||||
from common.utils import generate_choices_w_labels
|
||||
from common.forms import ChoiceForm
|
||||
|
||||
|
||||
@@ -44,12 +42,12 @@ def get_obj_from_content_type_string(string):
|
||||
model, pk = string.split(u',')
|
||||
ct = ContentType.objects.get(model=model)
|
||||
return ct.get_object_for_this_type(pk=pk)
|
||||
|
||||
|
||||
|
||||
def assign_remove(request, left_list, right_list, add_method, remove_method, left_list_title, right_list_title, obj=None, object_name=None, decode_content_type=False):
|
||||
left_list_name = u'left_list'
|
||||
right_list_name = u'right_list'
|
||||
|
||||
|
||||
if request.method == 'POST':
|
||||
if u'%s-submit' % left_list_name in request.POST.keys():
|
||||
unselected_list = ChoiceForm(request.POST,
|
||||
@@ -101,7 +99,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
|
||||
'title': left_list_title,
|
||||
'submit_label': _(u'Add'),
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
'name':'generic_form_subtemplate.html',
|
||||
'grid': 6,
|
||||
@@ -121,13 +119,13 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
|
||||
'object': obj
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
if object_name:
|
||||
context.update(
|
||||
{
|
||||
'object_name': object_name,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
return render_to_response('generic_form.html', context,
|
||||
context_instance=RequestContext(request))
|
||||
|
||||
Reference in New Issue
Block a user