innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
17,147 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

10477 Commits

Author SHA1 Message Date
Grzegorz Nosek 0b6f9f7c6f Improved fix for #18373 -- backward compatibility 
Commit 79558c78 cleaned up the (undocumented) interface of Resolver404
exception, which breaks compatibility with code messing with .args[0]
directly. Revert the cleanup part and simply leave the fix itself.
 2014-02-15 17:51:18 +01:00
Christopher Medrela d0133504e5 Fixed #22047 -- detecting related_name clash with inheritance 
Thanks to mondone for fruitful colaboration.
 2014-02-15 17:24:05 +01:00
Tim Graham 65b421c661 Fixed some flake8 errors from recent commits. 2014-02-15 11:21:15 -05:00
Aaron France 1150053b99 Fixed #21912 -- Improved error message if a view returns None. 
Thanks brycenesbitt for the report.
 2014-02-15 11:18:16 -05:00
Marek Wywiał d97bf2e9c8 Fixed #21765 -- Added support for comparing Context instances 2014-02-15 17:14:28 +01:00
Grzegorz Nosek 79558c787e Fixed #18373 - improved handling of Resolver404s from views 
When django.core.urlresolvers.resolve was called from a view, failed
and the exception was propagated and rendered by technical_404_response,
the URL mentioned on the page was the current URL instead of the URL
passed to resolve().

Fixed by using the path attribute from the Resolver404 exception instead
of request.path_info. Also cleaned up the exceptions to use standard
named parameters instead of stuffing a dict in args[0]
 2014-02-15 15:56:04 +01:00
Albert Wang 8bbdcc76e4 Fixed #19299 -- Fixed Nullification of Foreign Keys To CharFields 
Thanks tunixman for the report and Baptiste Mispelon and
Shai Berger for reviews.
 2014-02-15 09:47:32 -05:00
Rodolfo Carvalho 4d4e0ea461 Fixed two typos. 2014-02-15 15:16:16 +01:00
Rodolfo Carvalho fd4d8f0f52 Fixed typo in comment. 2014-02-15 15:14:58 +01:00
Aaron France 23b781cc3d Fixed #22018 -- Fixed checks for ModelAdmin.fields not handling sub-lists. 
Flatten a level of sublists before checking for duplicate fields.

When given sublists such as:

```python

class FooAdmin(admin.ModelAdmin):
    fields = ('one', ('one', 'two'))
```

The previous code did not correctly detect the duplicated 'one' field.

Thanks to jwa for the report.
 2014-02-15 15:01:44 +01:00
Rodolfo Carvalho 2ebccebf06 Fixed typo in test docstring. 2014-02-15 14:19:33 +01:00
Tim Graham 8251438cb8 Moved relative URL handling added in refs #21177 to a better place. 
Thanks apollo13: "reverse() shouldn't know about absolute/relative paths."
 2014-02-15 07:54:35 -05:00
Rodolfo Carvalho be6d1f39e8 Fixed typo in docstring. 2014-02-15 13:35:41 +01:00
Anton Baklanov 0bd92d68ad Fixed #22035 -- reordered migration operations 
Now AddField actions appear in operations list before AlterUniqueTogether
actions.

Thanks to SmileyChris for the report.
 2014-02-14 20:00:39 -05:00
Klemens Mantzos f683cb90be Fixed #21924 -- Added the ability to specify a reverse order for admin_order_field. 
Thanks Klemens Mantzos for the report and initial patch.
 2014-02-14 19:53:44 -05:00
Lukasz Balcerzak 0242134d32 Fixed #17942 -- Added a JsonResponse class to more easily create JSON encoded responses. 
Thanks leahculver for the suggestion and Erik Romijn,
Simon Charette, and Marc Tamlyn for the reviews.
 2014-02-14 18:25:19 -05:00
Antoine Catton e3d0790bd0 Fixed #21177 -- Made resolve_url support relative URLs. 
This fixes redirecting to relative URLs with django.shortcuts.redirect.
 2014-02-14 17:58:03 -05:00
Bas Peschier 83a3add4be Removed _actions_icnt declaration from local scope in admin JS. 
Commit 4523fcd introduces _actions_icnt to the local scope,
which overrides the value set in the HTML.

The admin would incorrectly show selected rows in a change list
as "1 of undefined selected".
 2014-02-13 14:30:18 -05:00
Florian Apolloner 474eeccb52 Fixed a typo (I guess). 2014-02-13 17:36:53 +01:00
Jeremy f94f466cd3 Fixed #19496 -- Added truncatechars_html filter. 
Thanks esevece for the suggestion and  Nick Sandford and Martin Warne
for the inital work on the patch.
 2014-02-13 10:27:27 -05:00
Adam Avramov 390001ce52 Fixed #21064 -- Refactored common logic in ModelAdmin.add_view and change_view. 2014-02-13 07:31:18 -05:00
Andrew Godwin f0f1ba75b0 Fixed #21856: Don't crash runserver when DATABASES = {} 2014-02-12 19:09:43 +00:00
Andrew Godwin 7e941ba67c Reverting unapplied migrations check away from being a system-level check. 
This reverts commit 0ac13ecceb.
 2014-02-12 18:55:20 +00:00
Andrew Godwin bad9456b9c Fix my slightly hasty autodetector changes 2014-02-12 17:22:50 +00:00
Andrew Godwin 80bbe2265d Remove redunant code from RunPython operation 2014-02-12 17:21:25 +00:00
Andrew Godwin b333de0f5d Add --empty option to makemigrations 2014-02-12 17:16:40 +00:00
Loic Bistuer 7e27885c6e Reworked the detection of local storages for the collectstatic command. 
Before 4befb30 the detection was broken because we used isinstance
against a LazyObject rather than against a Storage class. That commit
fixed it by looking directly at the object wrapped by LazyObject.
This could however be a problem to anyone who subclasses the
collectstatic management Command and directly supplies a Storage class.

Refs #21581.
 2014-02-12 11:00:01 -05:00
Eli Bendersky 73f51e4113 Fixed #22025 -- Listing app followed by app.Model in dumpdata command 
When invoked as follows:

  $ python manage.py dumpdata blogapp blogapp.Tag

Django would throw a TypeError. This commit fixes the problem and provides
a test.
 2014-02-12 15:34:26 +01:00
Claude Paroz e0381cdf2e Fixed #22017 -- Prevented RuntimeError on Python 3 
Refs #21049. Thanks quinox for the report.
 2014-02-12 10:26:08 +01:00
Christopher Adams eefc88feef Fixed #2445 -- Allowed limit_choices_to attribute to be a callable. 
ForeignKey or ManyToManyField attribute ``limit_choices_to`` can now
be a callable that returns either a ``Q`` object or a dict.

Thanks michael at actrix.gen.nz for the original suggestion.
 2014-02-11 14:05:12 -05:00
Florian Apolloner a718fcf201 Reordered INSTALLED_APPS in default template, refs #22005 2014-02-11 09:01:48 +01:00
Claude Paroz fb1e3435a4 Fixed #21996 -- Used proper encoding for GeoIP content 
Thanks Florent Messa for the report.
 2014-02-10 16:09:04 +01:00
Christopher Medrela ee9fcb1672 Fixed #17673 -- Forbid field shadowing. 
Thanks Anssi Kääriäinen for the suggestion.
 2014-02-10 10:04:19 -05:00
julien 'pouete' Godin f5123c7291 Fixed #21371 -- Added the block.super to admin bodyclass blocks. 
Thanks Keryn Knight for the report.
 2014-02-10 09:13:29 -05:00
Julian Wachholz 9a4ee8ddb8 Fixed #21994 -- Added form_dict argument to calls of WizardView.done() 
Added an additional keyword argument ``form_dict`` to calls of
WizardView.done() implementations which allows easier access to validated
forms by their step name.
 2014-02-10 07:28:39 -05:00
Si Feng b102c27ff4 Fixed #20784 -- Added inverse_match parameter to RegexValidator. 2014-02-10 05:38:43 -05:00
Chris Bailey c5395eef76 Allowed a message to be passed to assertQuerysetEqual to make it consistent with other assert methods. 2014-02-10 05:21:23 -05:00
Tim Graham 21f034165c Removed unused import in humanize tests. 2014-02-09 16:30:08 -05:00
Adam Avramov 651a6f76f3 Fixed #21992: Skipped test when pytz is missing. 
The test fails on Windows when pytz is not installed.
 2014-02-09 16:23:14 -05:00
Robert Stapenhurst 12385a5f86 Fixed #21763 -- Added an error msg for missing methods on ManyRelatedManager. 
Attempting to add() and remove() an object related by a 'through' model
now raises more descriptive AttributeErrors, in line with set and
create().
 2014-02-09 16:01:17 -05:00
Claude Paroz e2f28572b7 Merge pull request #2245 from funkybob/parse_header 
Replaced _parse_content_type with cgi.parse_header
 2014-02-09 20:39:07 +01:00
Marc Tamlyn d238ab2991 Silence deprecation warnings. 
Also they should only be raised if allow_syncdb does exist, not just if
allow_migrate does not.

Refs comments on 250841017c
 2014-02-09 17:48:15 +00:00
Ryan Kaskel d25622000a Fixed #21382 - Added "has_original" to stacked inlines. 
Report and original patch from jrief.
 2014-02-09 12:20:09 -05:00
Alasdair Nicol 1b29d32894 Fixed #21771 -- Made log_deletion consistent with other log methods. 
Thanks Keryn Knight for the report.
 2014-02-09 12:08:03 -05:00
Jannis Leidel f90be002d9 Fixed #20780 -- Get rid of stale symlinks when using collectstatic. 
Thanks to John Giannelos for the initial patch.
 2014-02-09 14:48:11 +00:00
Vajrasky Kok 6a9ed7d403 Fixed #19879 -- Have 'findstatic' says on which directories it searched the relative paths. 
Added searched_locations in finders module. Added verbosity flag level 2 on 'findstatic'
command that will output the directories on which it searched the relative paths.

Reported by ccurvey. Initial patch by Jonas Svensson and Vajrasky Kok.
 2014-02-09 14:22:22 +00:00
Andrew Godwin 935e6c1dfc Fixed #21868: Don't die when seeing py3 namespace packages for mig dirs 2014-02-09 14:03:41 +00:00
Andrew Godwin 11c021336c Fixed #21958: Handle dependencies for swappable models in AddField 2014-02-09 12:46:38 +00:00
Andrew Godwin 42607a9e33 Fixed #21844: Move quote_parameter off of Operations and rename 2014-02-09 12:42:26 +00:00
Jannis Leidel 5cc0555603 Fixed #21482 -- Uplifted restriction of collectstatic using symlink option in Windows NT 6. 
Original patch by Vajrasky Kok. Reviewed by Florian Apolloner, Aymeric Augustin.
 2014-02-09 12:39:20 +00:00