mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-15 21:02:52 +00:00
Code Issues 32 Releases Wiki Activity
17,496 Commits 29 Branches 429 Tags
Commit Graph

5305 Commits

Author SHA1 Message Date
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
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
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
Baptiste Mispelon
6873eeeefb Fixed #22030 -- Don't assume that all fields have a swappable_setting attribute. 2014-02-13 17:43:21 +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
Baptiste Mispelon
c3434fed5b Removed test for migration check forgotten in 7e941ba67ceab8a74ba50509d13ed4298f8305cd. 2014-02-13 09:31:39 +01:00
Andrew Godwin
bad9456b9c Fix my slightly hasty autodetector changes 2014-02-12 17:22:50 +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
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
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
Si Feng
b102c27ff4 Fixed #20784 -- Added inverse_match parameter to RegexValidator. 2014-02-10 05:38:43 -05:00
Chris Bailey
0d98422b13 Refactored RecursiveM2MTests into smaller pieces, refs #18586. 2014-02-10 05:22:30 -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
Tim Graham
29345390b8 Minor edits to new findstatic functionality; refs #19879. 
Hopefully fixes a test failure on Jenkins.
 2014-02-09 15:39:04 -05: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
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
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
Andrew Godwin
d5df7a0515 Fixed #21969: Fix behaviour of initial_data with migrated apps 2014-02-09 12:22:59 +00:00
Ryan Kaskel
75a96f06e9 Fixed #21967: Added check for object in ModelFormMixin.get_form_kwargs. 
Thanks lagovas.lagovas at gmail.com for the report.
 2014-02-09 06:30:03 -05:00
Marc Tamlyn
80cd64ee17 Fixed #21247 -- Made method_decorator play nicely with descriptors 
When a method decorator was used in conjunction with a decorator
implemented as a descriptor, method_decorator did not correctly respect
the method binding.

Thanks for Graham Dumpleton for the report and initial patch.
 2014-02-09 11:23:09 +00:00
Andrew Godwin
97a8fd4682 Fixed #21954: Raise nice error when serializing datetimes with timezones 2014-02-09 11:17:38 +00:00
Tim Graham
4f8e8a6ec2 Removed unused imports + other flake8 fixes. 2014-02-09 06:13:10 -05:00
Andrew Godwin
98dd8dd02e Fixed #21892: RunPython no longer accepts strings 2014-02-09 10:54:02 +00:00
Andrew Godwin
38b4adc696 Merge pull request #2244 from mlavin/21856-migration-checks 
Fixed #21856: Allow Empty DATABASES Setting
 2014-02-09 10:46:57 +00:00
Marc Tamlyn
46a87214ca Merge pull request #1997 from dpwrussell/method_decorator_args_fix 
Used available_attrs in method_decorator
 2014-02-09 10:12:22 +00:00
Aymeric Augustin
07ae47f7f8 Fixed #21959 -- Handled Inf/NaN in widthratio tag. 
Thanks rmoe for the report and the patch.
 2014-02-08 21:01:55 +01:00
Berker Peksag
5d263dee30 Fixed #21674 -- Deprecated the import_by_path() function in favor of import_string(). 
Thanks Aymeric Augustin for the suggestion and review.
 2014-02-08 11:12:19 -05:00
mlavin
a3e0d7753d Adding tests for check_migrations. 2014-02-08 09:05:27 -05:00
Tim Graham
6c5a30b4e7 Added tests for LocalMemCache deadlocks. refs #20613 and refs #18541. 
Thanks Zach Smith for the patch.
 2014-02-08 05:49:27 -05:00
Claude Paroz
02add43568 Fixed #21417 -- Expanded TEMPLATE_STRING_IF_INVALID in blocktrans 
Thanks keturn for the reporti, Chris Medrela for details and
Tim Graham for the review.
Refs #19915.
 2014-02-08 11:06:54 +01:00
Loic Bistuer
8847a0c601 Fixed #16192 -- Made unique error messages in ModelForm customizable. 
Overriding the error messages now works for both unique fields, unique_together
and unique_for_date.

This patch changed the overriding logic to allow customizing NON_FIELD_ERRORS
since previously only fields' errors were customizable.

Refs #20199.

Thanks leahculver for the suggestion.
 2014-02-08 04:59:09 -05:00
Chris Wilson
65131911db Fixed #21518 -- Made override_settings(ROOT_URLCONF) clear the resolver cache. 
Thanks Aymeric Augustin and Simon Charette for reviews.
 2014-02-07 15:29:25 -05:00
Vajrasky Kok
d3cf6cfacf Fixed #17713 -- Renamed BaseDatabaseFeatures.allows_primary_key_0 to allows_auto_pk_0. 
MySQL does allow primary key with value 0. It only forbids autoincrement
primary key with value 0.

Thanks Claude Paroz for the report.
 2014-02-06 05:16:40 -05:00
Vajrasky Kok
c43c469a2e Fixed #21731 -- Made javascript_quote escapes '</'. 2014-02-06 04:02:09 -05:00
Alex Gaynor
55d19d370f Removed import which is now unused 2014-02-05 13:26:56 -08:00
Baptiste Mispelon
a878bf9b09 Revert "Fixed #20296 -- Allowed SafeData and EscapeData to be lazy" 
This reverts commit 2ee447fb5f8974b432d3dd421af9a242215aea44.

That commit introduced a regression (#21882) and didn't really
do what it was supposed to: while it did delay the evaluation
of lazy objects passed to mark_safe(), they weren't actually
marked as such so they could end up being escaped twice.

Refs #21882.
 2014-02-05 21:22:40 +01:00
Anssi Kääriäinen
c29d6f7676 Fixed #21952 -- signals deadlock due to locking + weakref interaction 2014-02-05 20:57:40 +01:00
Carl Meyer
2b27224180 Fixed #21929 - Fixed test regression on Windows. 
Thanks Michael Manfre for the report.
 2014-02-04 13:14:41 -07:00
Claude Paroz
343dfff133 Removed the this_is_the_login_form hack 
Refs #21911. Now that we have a more traditional login form, we
don't need any more a special field telling us we are dealing with
the login form.
 2014-02-04 20:02:28 +01:00
Claude Paroz
be0ad62994 Fixed #21911 -- Made admin views redirect to login when needed 
Historically, the Django admin used to pass through the request
from an unauthorized access to the login view directly. Now we
are using a proper redirection, which is also preventing
inadvertantly changing data when POSTing login data to an admin
view when user is already authorized.
Thanks Marc Tamlyn and Tim Graham for the reviews.
 2014-02-04 20:02:28 +01:00
Claude Paroz
5848bea9dc Made staff_member_required redirect to login 
Refs #21911.
 2014-02-04 20:02:28 +01:00
Anssi Kääriäinen
35cecb1ebd Fixed #21748 -- join promotion for negated AND conditions 
Made sure Django treats case .filter(NOT (a AND b)) the same way as
.filter((NOT a OR NOT b)) for join promotion.
 2014-02-04 18:48:06 +02:00
Aymeric Augustin
ab922c5cd8 Fixed typo in 3ffeb931. 2014-02-02 23:40:16 +01:00
Michael Manfre
e1d839237f Make mysql's CursorWrapper a contextmanager. 2014-02-02 22:43:53 +01:00