Author: zain
Date: 2009-06-30 23:00:34 -0500 (Tue, 30 Jun 2009)
New Revision: 11132
Added:
django/branches/soc2009/admin-ui/django/contrib/admin/media/js/jquery-tablednd.js
Modified:
django/branches/soc2009/admin-ui/django/contrib/admin/media/css/base.css
django/branches/soc2009/admin-ui/django/contrib/admin/options.py
django/branches/soc2009/admin-ui/django/contrib/admin/templates/admin/edit_inline/tabular.html
django/branches/soc2009/admin-ui/django/db/models/fields/__init__.py
django/branches/soc2009/admin-ui/django/forms/fields.py
django/branches/soc2009/admin-ui/django/forms/formsets.py
Log:
[soc2009/admin-ui] Reordering tabular inlines, with support for other inlines
coming next.
On a model, add:
order = models.OrderField()
On the model's TabularInline admin object, add:
order_field = 'order'
Modified:
django/branches/soc2009/admin-ui/django/contrib/admin/media/css/base.css
===================================================================
--- django/branches/soc2009/admin-ui/django/contrib/admin/media/css/base.css
2009-07-01 02:51:48 UTC (rev 11131)
+++ django/branches/soc2009/admin-ui/django/contrib/admin/media/css/base.css
2009-07-01 04:00:34 UTC (rev 11132)
@@ -260,7 +260,6 @@
padding: 2px 5px;
font-size: 11px;
background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x;
- border-left: 1px solid #ddd;
border-bottom: 1px solid #ddd;
}
@@ -328,20 +327,29 @@
/* ORDERABLE TABLES */
-table.orderable tbody tr td:hover {
- cursor: move;
+table.orderable tbody tr.hover {
+ background-color: #F6F6F6;
}
-table.orderable tbody tr td:first-child {
- padding-left: 14px;
+table.orderable tbody tr td:nth-child(2) {
+ padding-left: 15px;
background-image: url(../img/admin/nav-bg-grabber.gif);
background-repeat: repeat-y;
}
+table.orderable tbody tr td.original p {
+ margin-left: 9px;
+}
+
table.orderable-initalized .order-cell, body>tr>td.order-cell {
display: none;
}
+.tDnD_whileDrag {
+ border: 2px dashed #CCC;
+ background-color: #F6F6F6;
+}
+
/* FORM DEFAULTS */
input, textarea, select {
Added:
django/branches/soc2009/admin-ui/django/contrib/admin/media/js/jquery-tablednd.js
===================================================================
---
django/branches/soc2009/admin-ui/django/contrib/admin/media/js/jquery-tablednd.js
(rev 0)
+++
django/branches/soc2009/admin-ui/django/contrib/admin/media/js/jquery-tablednd.js
2009-07-01 04:00:34 UTC (rev 11132)
@@ -0,0 +1,382 @@
+/**
+ * TableDnD plug-in for JQuery, allows you to drag and drop table rows
+ * You can set up various options to control how the system will work
+ * Copyright (c) Denis Howlett <den...@isocra.com>
+ * Licensed like jQuery, see http://docs.jquery.com/License.
+ *
+ * Configuration options:
+ *
+ * onDragStyle
+ * This is the style that is assigned to the row during drag. There are
limitations to the styles that can be
+ * associated with a row (such as you can't assign a border--well you can,
but it won't be
+ * displayed). (So instead consider using onDragClass.) The CSS style to
apply is specified as
+ * a map (as used in the jQuery css(...) function).
+ * onDropStyle
+ * This is the style that is assigned to the row when it is dropped. As
for onDragStyle, there are limitations
+ * to what you can do. Also this replaces the original style, so again
consider using onDragClass which
+ * is simply added and then removed on drop.
+ * onDragClass
+ * This class is added for the duration of the drag and then removed when
the row is dropped. It is more
+ * flexible than using onDragStyle since it can be inherited by the row
cells and other content. The default
+ * is class is tDnD_whileDrag. So to use the default, simply customise
this CSS class in your
+ * stylesheet.
+ * onDrop
+ * Pass a function that will be called when the row is dropped. The
function takes 2 parameters: the table
+ * and the row that was dropped. You can work out the new order of the
rows by using
+ * table.rows.
+ * onDragStart
+ * Pass a function that will be called when the user starts dragging. The
function takes 2 parameters: the
+ * table and the row which the user has started to drag.
+ * onAllowDrop
+ * Pass a function that will be called as a row is over another row. If
the function returns true, allow
+ * dropping on that row, otherwise not. The function takes 2 parameters:
the dragged row and the row under
+ * the cursor. It returns a boolean: true allows the drop, false doesn't
allow it.
+ * scrollAmount
+ * This is the number of pixels to scroll if the user moves the mouse
cursor to the top or bottom of the
+ * window. The page should automatically scroll up or down as appropriate
(tested in IE6, IE7, Safari, FF2,
+ * FF3 beta
+ * dragHandle
+ * This is the name of a class that you assign to one or more cells in
each row that is draggable. If you
+ * specify this class, then you are responsible for setting cursor: move
in the CSS and only these cells
+ * will have the drag behaviour. If you do not specify a dragHandle, then
you get the old behaviour where
+ * the whole row is draggable.
+ *
+ * Other ways to control behaviour:
+ *
+ * Add class="nodrop" to any rows for which you don't want to allow dropping,
and class="nodrag" to any rows
+ * that you don't want to be draggable.
+ *
+ * Inside the onDrop method you can also call $.tableDnD.serialize() this
returns a string of the form
+ * <tableID>[]=<rowID1>&<tableID>[]=<rowID2> so that you can send this back to
the server. The table must have
+ * an ID as must all the rows.
+ *
+ * Other methods:
+ *
+ * $("...").tableDnDUpdate()
+ * Will update all the matching tables, that is it will reapply the mousedown
method to the rows (or handle cells).
+ * This is useful if you have updated the table rows using Ajax and you want
to make the table draggable again.
+ * The table maintains the original configuration (so you don't have to
specify it again).
+ *
+ * $("...").tableDnDSerialize()
+ * Will serialize and return the serialized string as above, but for each of
the matching tables--so it can be
+ * called from anywhere and isn't dependent on the currentTable being set up
correctly before calling
+ *
+ * Known problems:
+ * - Auto-scoll has some problems with IE7 (it scrolls even when it
shouldn't), work-around: set scrollAmount to 0
+ *
+ * Version 0.2: 2008-02-20 First public version
+ * Version 0.3: 2008-02-07 Added onDragStart option
+ * Made the scroll amount configurable (default is 5
as before)
+ * Version 0.4: 2008-03-15 Changed the noDrag/noDrop attributes to
nodrag/nodrop classes
+ * Added onAllowDrop to control dropping
+ * Fixed a bug which meant that you couldn't set the
scroll amount in both directions
+ * Added serialize method
+ * Version 0.5: 2008-05-16 Changed so that if you specify a dragHandle class
it doesn't make the whole row
+ * draggable
+ * Improved the serialize method to use a default (and
settable) regular expression.
+ * Added tableDnDupate() and tableDnDSerialize() to be
called when you are outside the table
+ */
+jQuery.tableDnD = {
+ /** Keep hold of the current table being dragged */
+ currentTable : null,
+ /** Keep hold of the current drag object if any */
+ dragObject: null,
+ /** The current mouse offset */
+ mouseOffset: null,
+ /** Remember the old value of Y so that we don't do too much processing */
+ oldY: 0,
+
+ /** Actually build the structure */
+ build: function(options) {
+ // Set up the defaults if any
+
+ this.each(function() {
+ // This is bound to each matching table, set up the defaults and
override with user options
+ this.tableDnDConfig = jQuery.extend({
+ onDragStyle: null,
+ onDropStyle: null,
+ // Add in the default class for whileDragging
+ onDragClass: "tDnD_whileDrag",
+ onDrop: null,
+ onDragStart: null,
+ scrollAmount: 5,
+ serializeRegexp: /[^\-]*$/, // The regular
expression to use to trim row IDs
+ serializeParamName: null, // If you want to
specify another parameter name instead of the table ID
+ dragHandle: null // If you give the name of a class here, then
only Cells with this class will be draggable
+ }, options || {});
+ // Now make the rows draggable
+ jQuery.tableDnD.makeDraggable(this);
+ });
+
+ // Now we need to capture the mouse up and mouse move event
+ // We can use bind so that we don't interfere with other event handlers
+ jQuery(document)
+ .bind('mousemove', jQuery.tableDnD.mousemove)
+ .bind('mouseup', jQuery.tableDnD.mouseup);
+
+ // Don't break the chain
+ return this;
+ },
+
+ /** This function makes all the rows on the table draggable apart from
those marked as "NoDrag" */
+ makeDraggable: function(table) {
+ var config = table.tableDnDConfig;
+ if (table.tableDnDConfig.dragHandle) {
+ // We only need to add the event to the specified cells
+ var cells =
jQuery("td."+table.tableDnDConfig.dragHandle, table);
+ cells.each(function() {
+ // The cell is bound to "this"
+ jQuery(this).mousedown(function(ev) {
+ jQuery.tableDnD.dragObject = this.parentNode;
+ jQuery.tableDnD.currentTable = table;
+ jQuery.tableDnD.mouseOffset =
jQuery.tableDnD.getMouseOffset(this, ev);
+ if (config.onDragStart) {
+ // Call the onDrop method if there is one
+ config.onDragStart(table, this);
+ }
+ return false;
+ });
+ })
+ } else {
+ // For backwards compatibility, we add the event to the
whole row
+ var rows = jQuery("tr", table); // get all the rows as a
wrapped set
+ rows.each(function() {
+ // Iterate through each row, the row is bound
to "this"
+ var row = jQuery(this);
+ if (! row.hasClass("nodrag")) {
+ row.mousedown(function(ev) {
+ if (ev.target.tagName == "TD") {
+ jQuery.tableDnD.dragObject = this;
+ jQuery.tableDnD.currentTable = table;
+ jQuery.tableDnD.mouseOffset =
jQuery.tableDnD.getMouseOffset(this, ev);
+ if (config.onDragStart) {
+ // Call the onDrop method if there is one
+ config.onDragStart(table, this);
+ }
+ return false;
+ }
+ }).css("cursor", "move"); // Store the tableDnD object
+ }
+ });
+ }
+ },
+
+ updateTables: function() {
+ this.each(function() {
+ // this is now bound to each matching table
+ if (this.tableDnDConfig) {
+ jQuery.tableDnD.makeDraggable(this);
+ }
+ })
+ },
+
+ /** Get the mouse coordinates from the event (allowing for browser
differences) */
+ mouseCoords: function(ev){
+ if(ev.pageX || ev.pageY){
+ return {x:ev.pageX, y:ev.pageY};
+ }
+ return {
+ x:ev.clientX + document.body.scrollLeft - document.body.clientLeft,
+ y:ev.clientY + document.body.scrollTop - document.body.clientTop
+ };
+ },
+
+ /** Given a target element and a mouse event, get the mouse offset from
that element.
+ To do this we need the element's position and the mouse position */
+ getMouseOffset: function(target, ev) {
+ ev = ev || window.event;
+
+ var docPos = this.getPosition(target);
+ var mousePos = this.mouseCoords(ev);
+ return {x:mousePos.x - docPos.x, y:mousePos.y - docPos.y};
+ },
+
+ /** Get the position of an element by going up the DOM tree and adding up
all the offsets */
+ getPosition: function(e){
+ var left = 0;
+ var top = 0;
+ /** Safari fix -- thanks to Luis Chato for this! */
+ if (e.offsetHeight == 0) {
+ /** Safari 2 doesn't correctly grab the offsetTop of a table row
+ this is detailed here:
+
http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari/
+ the solution is likewise noted there, grab the offset of a table
cell in the row - the firstChild.
+ note that firefox will return a text node as a first child, so
designing a more thorough
+ solution may need to take that into account, for now this seems to
work in firefox, safari, ie */
+ e = e.firstChild; // a table cell
+ }
+
+ while (e.offsetParent){
+ left += e.offsetLeft;
+ top += e.offsetTop;
+ e = e.offsetParent;
+ }
+
+ left += e.offsetLeft;
+ top += e.offsetTop;
+
+ return {x:left, y:top};
+ },
+
+ mousemove: function(ev) {
+ if (jQuery.tableDnD.dragObject == null) {
+ return;
+ }
+
+ var dragObj = jQuery(jQuery.tableDnD.dragObject);
+ var config = jQuery.tableDnD.currentTable.tableDnDConfig;
+ var mousePos = jQuery.tableDnD.mouseCoords(ev);
+ var y = mousePos.y - jQuery.tableDnD.mouseOffset.y;
+ //auto scroll the window
+ var yOffset = window.pageYOffset;
+ if (document.all) {
+ // Windows version
+ //yOffset=document.body.scrollTop;
+ if (typeof document.compatMode != 'undefined' &&
+ document.compatMode != 'BackCompat') {
+ yOffset = document.documentElement.scrollTop;
+ }
+ else if (typeof document.body != 'undefined') {
+ yOffset=document.body.scrollTop;
+ }
+
+ }
+
+ if (mousePos.y-yOffset < config.scrollAmount) {
+ window.scrollBy(0, -config.scrollAmount);
+ } else {
+ var windowHeight = window.innerHeight ? window.innerHeight
+ : document.documentElement.clientHeight ?
document.documentElement.clientHeight : document.body.clientHeight;
+ if (windowHeight-(mousePos.y-yOffset) < config.scrollAmount) {
+ window.scrollBy(0, config.scrollAmount);
+ }
+ }
+
+
+ if (y != jQuery.tableDnD.oldY) {
+ // work out if we're going up or down...
+ var movingDown = y > jQuery.tableDnD.oldY;
+ // update the old value
+ jQuery.tableDnD.oldY = y;
+ // update the style to show we're dragging
+ if (config.onDragClass) {
+ dragObj.addClass(config.onDragClass);
+ } else {
+ dragObj.css(config.onDragStyle);
+ }
+ // If we're over a row then move the dragged row to there so that
the user sees the
+ // effect dynamically
+ var currentRow = jQuery.tableDnD.findDropTargetRow(dragObj, y);
+ if (currentRow) {
+ // TODO worry about what happens when there are multiple
TBODIES
+ if (movingDown && jQuery.tableDnD.dragObject != currentRow) {
+
jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject,
currentRow.nextSibling);
+ } else if (! movingDown && jQuery.tableDnD.dragObject !=
currentRow) {
+
jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject,
currentRow);
+ }
+ }
+ }
+
+ return false;
+ },
+
+ /** We're only worried about the y position really, because we can only
move rows up and down */
+ findDropTargetRow: function(draggedRow, y) {
+ var rows = jQuery.tableDnD.currentTable.rows;
+ for (var i=0; i<rows.length; i++) {
+ var row = rows[i];
+ var rowY = this.getPosition(row).y;
+ var rowHeight = parseInt(row.offsetHeight)/2;
+ if (row.offsetHeight == 0) {
+ rowY = this.getPosition(row.firstChild).y;
+ rowHeight = parseInt(row.firstChild.offsetHeight)/2;
+ }
+ // Because we always have to insert before, we need to offset the
height a bit
+ if ((y > rowY - rowHeight) && (y < (rowY + rowHeight))) {
+ // that's the row we're over
+ // If it's the same as the current row, ignore
it
+ if (row == draggedRow) {return null;}
+ var config = jQuery.tableDnD.currentTable.tableDnDConfig;
+ if (config.onAllowDrop) {
+ if (config.onAllowDrop(draggedRow, row)) {
+ return row;
+ } else {
+ return null;
+ }
+ } else {
+ // If a row has nodrop class, then
don't allow dropping (inspired by John Tarr and Famic)
+ var nodrop = jQuery(row).hasClass("nodrop");
+ if (! nodrop) {
+ return row;
+ } else {
+ return null;
+ }
+ }
+ return row;
+ }
+ }
+ return null;
+ },
+
+ mouseup: function(e) {
+ if (jQuery.tableDnD.currentTable && jQuery.tableDnD.dragObject) {
+ var droppedRow = jQuery.tableDnD.dragObject;
+ var config = jQuery.tableDnD.currentTable.tableDnDConfig;
+ // If we have a dragObject, then we need to release it,
+ // The row will already have been moved to the right place so we
just reset stuff
+ if (config.onDragClass) {
+ jQuery(droppedRow).removeClass(config.onDragClass);
+ } else {
+ jQuery(droppedRow).css(config.onDropStyle);
+ }
+ jQuery.tableDnD.dragObject = null;
+ if (config.onDrop) {
+ // Call the onDrop method if there is one
+ config.onDrop(jQuery.tableDnD.currentTable, droppedRow);
+ }
+ jQuery.tableDnD.currentTable = null; // let go of the table too
+ }
+ },
+
+ serialize: function() {
+ if (jQuery.tableDnD.currentTable) {
+ return
jQuery.tableDnD.serializeTable(jQuery.tableDnD.currentTable);
+ } else {
+ return "Error: No Table id set, you need to set an id on your
table and every row";
+ }
+ },
+
+ serializeTable: function(table) {
+ var result = "";
+ var tableId = table.id;
+ var rows = table.rows;
+ for (var i=0; i<rows.length; i++) {
+ if (result.length > 0) result += "&";
+ var rowId = rows[i].id;
+ if (rowId && rowId && table.tableDnDConfig &&
table.tableDnDConfig.serializeRegexp) {
+ rowId = rowId.match(table.tableDnDConfig.serializeRegexp)[0];
+ }
+
+ result += tableId + '[]=' + rowId;
+ }
+ return result;
+ },
+
+ serializeTables: function() {
+ var result = "";
+ this.each(function() {
+ // this is now bound to each matching table
+ result += jQuery.tableDnD.serializeTable(this);
+ });
+ return result;
+ }
+
+}
+
+jQuery.fn.extend(
+ {
+ tableDnD : jQuery.tableDnD.build,
+ tableDnDUpdate : jQuery.tableDnD.updateTables,
+ tableDnDSerialize: jQuery.tableDnD.serializeTables
+ }
+);
\ No newline at end of file
Modified: django/branches/soc2009/admin-ui/django/contrib/admin/options.py
===================================================================
--- django/branches/soc2009/admin-ui/django/contrib/admin/options.py
2009-07-01 02:51:48 UTC (rev 11131)
+++ django/branches/soc2009/admin-ui/django/contrib/admin/options.py
2009-07-01 04:00:34 UTC (rev 11132)
@@ -1106,6 +1106,7 @@
formset = BaseInlineFormSet
extra = 3
max_num = 0
+ order_field = None
template = None
verbose_name = None
verbose_name_plural = None
@@ -1127,6 +1128,8 @@
js.append('js/urlify.js')
if self.filter_vertical or self.filter_horizontal:
js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
+ if self.order_field:
+ js.append('js/jquery-tablednd.js')
return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for
url in js])
media = property(_media)
Modified:
django/branches/soc2009/admin-ui/django/contrib/admin/templates/admin/edit_inline/tabular.html
===================================================================
---
django/branches/soc2009/admin-ui/django/contrib/admin/templates/admin/edit_inline/tabular.html
2009-07-01 02:51:48 UTC (rev 11131)
+++
django/branches/soc2009/admin-ui/django/contrib/admin/templates/admin/edit_inline/tabular.html
2009-07-01 04:00:34 UTC (rev 11132)
@@ -5,7 +5,7 @@
<fieldset class="module">
<h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
{{ inline_admin_formset.formset.non_form_errors }}
- <table>
+ <table class="{% if inline_admin_formset.opts.order_field %}orderable{%
endif %}">
<thead><tr>
{% for field in inline_admin_formset.fields %}
{% if not field.is_hidden %}
@@ -19,7 +19,7 @@
{% if inline_admin_form.form.non_field_errors %}
<tr><td colspan="{{ inline_admin_form.field_count }}">{{
inline_admin_form.form.non_field_errors }}</td></tr>
{% endif %}
- <tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or
inline_admin_form.show_url %}has_original{% endif %}">
+ <tr class="{% if not inline_admin_formset.opts.order_field %}{% cycle
'row1' 'row2' %} {% endif %}{% if inline_admin_form.original or
inline_admin_form.show_url %}has_original{% endif %}">
<td class="original">
{% if inline_admin_form.original or inline_admin_form.show_url %}<p>
@@ -68,3 +68,47 @@
{# </ul> #}
</div>
+
+<script type="text/javascript">
+$(function() {
+ {% if inline_admin_formset.opts.order_field %}
+ // highlight each row on hover
+ $("table.orderable tbody tr").hover(
+ function() {
+ $(this).addClass('hover');
+ },
+ function() {
+ $(this).removeClass('hover');
+ }
+ );
+
+ $('table.orderable').tableDnD({
+ onDragStart: function(table, row_obj) {
+ // once you start dragging a row, stop the hover()
highlighting.
+ // this is needed because the highlighting from onDragStyle
isn't always in
+ // sync with the hover() highlighting, which results in times
where you have
+ // two rows highlighted.
+ $("table.orderable tbody
tr").unbind('mouseenter').unbind('mouseleave');
+ },
+ onDrop: function(table, row_obj) {
+ var counter = 0;
+
+ $(row_obj).parent().find('input[id$="{{
inline_admin_formset.opts.order_field }}"]')
+ .each(function (i) {
+ $(this).val(counter++);
+ });
+
+ // rebind hover
+ $("table.orderable tbody tr").hover(
+ function() {
+ $(this).addClass('hover');
+ },
+ function() {
+ $(this).removeClass('hover');
+ }
+ );
+ }
+ });
+ {% endif %}
+});
+</script>
\ No newline at end of file
Modified: django/branches/soc2009/admin-ui/django/db/models/fields/__init__.py
===================================================================
--- django/branches/soc2009/admin-ui/django/db/models/fields/__init__.py
2009-07-01 02:51:48 UTC (rev 11131)
+++ django/branches/soc2009/admin-ui/django/db/models/fields/__init__.py
2009-07-01 04:00:34 UTC (rev 11132)
@@ -768,6 +768,16 @@
defaults.update(kwargs)
return super(NullBooleanField, self).formfield(**defaults)
+class OrderField(IntegerField):
+ def __init__(self, *args, **kwargs):
+ kwargs['default'] = 0
+ Field.__init__(self, *args, **kwargs)
+
+ def formfield(self, **kwargs):
+ defaults = {'form_class': forms.OrderField}
+ defaults.update(kwargs)
+ return super(OrderField, self).formfield(**defaults)
+
class PositiveIntegerField(IntegerField):
def get_internal_type(self):
return "PositiveIntegerField"
Modified: django/branches/soc2009/admin-ui/django/forms/fields.py
===================================================================
--- django/branches/soc2009/admin-ui/django/forms/fields.py 2009-07-01
02:51:48 UTC (rev 11131)
+++ django/branches/soc2009/admin-ui/django/forms/fields.py 2009-07-01
04:00:34 UTC (rev 11132)
@@ -40,7 +40,7 @@
'BooleanField', 'NullBooleanField', 'ChoiceField', 'MultipleChoiceField',
'ComboField', 'MultiValueField', 'FloatField', 'DecimalField',
'SplitDateTimeField', 'IPAddressField', 'FilePathField', 'SlugField',
- 'TypedChoiceField'
+ 'TypedChoiceField', 'OrderField'
)
# These values, if given to to_python(), will trigger the self.required check.
@@ -190,6 +190,9 @@
raise ValidationError(self.error_messages['min_value'] %
self.min_value)
return value
+class OrderField(IntegerField):
+ pass
+
class FloatField(Field):
default_error_messages = {
'invalid': _(u'Enter a number.'),
Modified: django/branches/soc2009/admin-ui/django/forms/formsets.py
===================================================================
--- django/branches/soc2009/admin-ui/django/forms/formsets.py 2009-07-01
02:51:48 UTC (rev 11131)
+++ django/branches/soc2009/admin-ui/django/forms/formsets.py 2009-07-01
04:00:34 UTC (rev 11132)
@@ -133,7 +133,7 @@
Returns a list of forms that have been marked for deletion. Raises an
AttributeError if deletion is not allowed.
"""
- if not self.is_valid() or not self.can_delete:
+ if not self.can_delete:
raise AttributeError("'%s' object has no attribute
'deleted_forms'" % self.__class__.__name__)
# construct _deleted_form_indexes which is just a list of form indexes
# that have had their deletion widget set to True
@@ -154,7 +154,7 @@
Returns a list of form in the order specified by the incoming data.
Raises an AttributeError if ordering is not allowed.
"""
- if not self.is_valid() or not self.can_order:
+ if not self.can_order:
raise AttributeError("'%s' object has no attribute
'ordered_forms'" % self.__class__.__name__)
# Construct _ordering, which is a list of (form_index,
order_field_value)
# tuples. After constructing this list, we'll sort it by
order_field_value
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
