mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-19 07:54:07 +00:00
Code Issues 24 Releases Wiki Activity
12,770 Commits 28 Branches 423 Tags 638 MiB
257c4011cb
Commit Graph

179 Commits

Author SHA1 Message Date
Claude Paroz
ebc773ada3 Replaced many smart_bytes by force_bytes 
In all those occurrences, we didn't care about preserving the
lazy status of the strings, but we really wanted to obtain a
real bytestring.
 2012-08-29 11:20:32 +02:00
Alex Gaynor
54afdbf378 Fixed usage of several deprecated aliases in unittest. 2012-08-15 01:38:04 -07:00
Claude Paroz
c2d59e5564 [py3] Fixed admin_views tests 
Also changed several occurrences of 'request' to 'response'.
 2012-08-14 14:45:28 +02:00
Aymeric Augustin
faf570df18 [py3] Compared response.content with bytes. 2012-08-14 12:29:53 +02:00
Aymeric Augustin
0d914d08a0 [py3] Updated urllib/urllib2/urlparse imports. 
Lots of functions were moved. Use explicit imports in all cases
to keey it easy to identify where the functions come from.
 2012-07-22 09:29:55 +02:00
Aymeric Augustin
bdca5ea345 [py3] Replaced unicode/str by six.text_type/bytes. 2012-07-22 09:29:54 +02:00
Julien Phalip
01c392623d Fixed #10057 -- Ensured that the 'show_delete' context variable in the admin's change view actually controls the display of the delete button. Thanks to rajeesh for the report, to patcoll for the patch, and to David Gouldin for the test. 2012-07-21 18:10:24 -07:00
Luke Plant
b0eee0ba4b Removed various unnecessary instances of mark_safe applied to URLs 
Also fixed some test breakages introduced in last commit
 2012-07-03 22:20:12 +01:00
Julien Phalip
2cd4cf58d3 Fixed #18550 -- Ensured that the admin history view works with escaped primary keys. 
Thanks to josh.oosterman for the report and patch.
 2012-07-01 18:40:50 -07:00
Aymeric Augustin
23d230f058 Merge pull request #123 from apollo13/ticket18381 
Fixed #18381 -- Stopped escaping object ids

when passing them to the contenttypes.shortcut view.

Thanks apollo13 for the patch and dhepper for the review.
 2012-06-08 01:48:41 -07:00
Claude Paroz
4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility. 
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
 2012-06-07 18:08:47 +02:00
Florian Apolloner
e1643e3535 Don't escape object ids when passing to the contenttypes.shortcut view. 
This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.
 2012-06-07 17:52:12 +02:00
Claude Paroz
b52672d778 Replaced deprecated TestCase methods. Refs #17049. 2012-05-03 16:39:16 +02:00
Anssi Kääriäinen
8fad77da95 Ensured tests pass using custom PASSWORD_HASHERS. 2012-04-30 22:10:27 +03:00
Aviral Dasgupta
0525f6d8bd Fixed some style issues in previous commit. 2012-04-29 21:31:09 +05:30
Aviral Dasgupta
d12d55ec26 Added regression test for #17967. 2012-04-29 17:26:22 +05:30
Claude Paroz
0e01023897 Converted more test assertions to assert[Not]Contains. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-14 13:35:25 +00:00
Claude Paroz
883c38c499 Fixed #17848 -- Added setting_changed signal for cases when TEMPLATE_CONTEXT_PROCESSORS is overriden in tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 13:24:57 +00:00
Julien Phalip
a0b55f30a8 Fixed #18086 -- Restored '-pk' as the default order in the admin changelist. This rectifies a slight change in behavior introduced in Django 1.4 and r17635. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-09 04:28:32 +00:00
Aymeric Augustin
eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 09:08:29 +00:00
Claude Paroz
9383a2761c Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 08:02:08 +00:00
Ramiro Morales
ecc8208f88 Removed executable bits from some files that don't need them. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-09 12:13:31 +00:00
Julien Phalip
399aa72330 Enabled the existing admin Selenium tests to be run with Internet Explorer. Note that some tweaks had to be made, in particular as IE7 has limited capabilities regarding CSS selectors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 08:13:09 +00:00
Julien Phalip
d636150e53 Fixed #17198 -- Ensured that a deterministic order is used across all database backends for displaying the admin change list's results. Many thanks to Luke Plant for the report and general approach, to everyone involved in the design discussions, and to Carl Meyer for the patch review. Refs #16819. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 02:13:35 +00:00
Adrian Holovaty
2ade1e916f Edited stuff from [17543] to [17629] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 17:16:52 +00:00
Ramiro Morales
4bbacd2663 Modified tests introduced in r15452 to not run 31 test cases twice. Thanks Julien for discovering this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 13:29:56 +00:00
Julien Phalip
f2de5f4cab Added some Selenium tests for the admin's filter_horizontal and filter_vertical widgets. Ref #13614, #15220. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-23 08:07:07 +00:00
Julien Phalip
a65eed3942 Enabled the admin selenium tests to run on Chrome. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 07:14:10 +00:00
Julien Phalip
f0c2228709 Fixed #13068 (again) -- Corrected the admin stacked inline template to allow prepopulated fields to work (Thanks Stanislas Guerra for the report). Also fixed a regression introduced in [16953] where prepopulated fields wouldn't be recognized any more due to the additional "field-" CSS class name prefix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 16:42:12 +00:00
Jannis Leidel
4dbeb4bca4 Fixed #17515 -- Added ability to override the template of custom admin FilterSpec classes. Thanks, saxix and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:59:05 +00:00
Jannis Leidel
bc8875e37c Fixed #16958 -- Correctly use the queryset method in the auth app's UserAdmin class. Thanks, mpaolini. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:57:40 +00:00
Jannis Leidel
b46d90c63a Fixed #7758 and #17189 -- Allowed to override the form_url context var in the admin change view and the user admin's password change view. Thanks, michal and krzysztof.szczesny. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:56:32 +00:00
Jannis Leidel
03eeb020a0 Fixed #159 -- Prevent the AdminSite from logging users out when they try to log in form the logout page. Many thanks, ashchristopher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:56:23 +00:00
Julien Phalip
0f6cf4aba1 Improved on r17454 to ensure that collapse.js only gets minified when DEBUG is False. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-05 10:26:05 +00:00
Carl Meyer
844a24bbb9 Fixed #16921 -- Added assertHTMLEqual and assertHTMLNotEqual assertions, and converted Django tests to use them where appropriate. Thanks Greg Müllegger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-31 20:36:11 +00:00
Ramiro Morales
554f0601b5 Stopped unconditionally reversing admin model add/change URLs. 
Starting with [16857] this could cause HTTP 500 errors when
`ModelAdmin.get_urls()` has been customized to the point it doesn't
provide these standard URLs.

Fixes #17333. Refs #15294.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 14:59:14 +00:00
Aymeric Augustin
58276bd338 Fixed #17377 -- Don't depend on a warm cache in admin_views.UserAdminTest.test_user_permission_performance. Thanks Gregor Müllegger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 12:04:37 +00:00
Julien Phalip
8ddecc39db Fixed #17252 -- Fixed a minor regression introduced by the work in #11868, where the default sorted columns wouldn't correctly be visually represented in the changelist table headers if those columns referred to non model fields. Thanks to sebastian for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-22 09:14:09 +00:00
Julien Phalip
2e2689c7c0 Fixed #15938 -- Prevented the max_length number in the admin prepopulated_fields javascript to be localized when USE_THOUSAND_SEPARATOR is turned on. Thanks to Lev Maximov, Mathieu Agopian and feel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 05:33:17 +00:00
Alex Gaynor
6c91521902 Remove the usage of deprecated function in Django. Also simplify the fallback code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:20:50 +00:00
Alex Gaynor
d362c1546f Convert much of the regression tests to use absolute imports. There's still work to be done though. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 18:51:33 +00:00
Julien Phalip
17659adf93 Fixed #16371 -- Added a prefix "field-" to all CSS class names automatically generated from field names in admin forms to avoid conflicts with other common class names (e.g. "button"). This is backwards-incompatible for those who previously used plain field names as selector in custom style sheets or javascript transformations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 12:35:06 +00:00
Paul McMillan
0781ed8ec8 Fixed #16837 -- Improved error message for admin login. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 04:16:21 +00:00
Ramiro Morales
aaf77c1676 Converted internal link generation in the admin and admin document generator to use named URLs. 
Thanks to Florian Apolloner for both the initial patch and his final push to get
this fixed, to Dario Ocles for his great work on the admin templates and
switching the admin_doc application to also use named URLs, to Mikko Hellsing
for his comments and to Jannis and Julien for their review and design guidance.

Fixes #15294.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-20 18:30:06 +00:00
Ramiro Morales
7b21bfc074 Improved test isolation of the admin tests and assigned custom admin sites to 
prevent test order dependant failures.

This involves introducing usage of `TestCase.urls` and implementing proper
admin.py modules for some of the test apps.

Thanks Florian Apolloner for finding the issue and contributing the patch.

Refs #15294 (it solves these problems so the fix for that ticket we are going
to commit doesn't introduce obscure and hard to reproduce test failures when
running the Django test suite.)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-20 18:16:49 +00:00
Julien Phalip
93fbb77d9b Fixed #16716 -- Fixed two small regressions in the development version introduced in r16144 where the changelist crashed with a 500 error instead of nicely operating a 302 redirection back to the changelist. 
The two specific cases were:

* a lookup through a non-existing field and apparently spanning multiple relationships (e.g. "?nonexistant__whatever=xxxx").
* a proper list_filter's queryset failing with an exception. In Django 1.3 the queryset was only directly manipulated by the changelist, whereas in 1.4 the list_filters may manipulate the queryset themselves. The fix here implies catching potential failures from the list_filters too.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-28 07:57:56 +00:00
Jannis Leidel
283526a5a6 Fixed #15206 -- Added select_related call to the permissions field of the GroupAdmin to lower the number of queries. Thanks, Chris Adams. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-15 09:01:12 +00:00
Jannis Leidel
d68666700f Fixed #16604 -- Use new save_related hook when saving objects on the changelist, too. Thanks, pdeglopper. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:24 +00:00
Jannis Leidel
332a485567 Fixed #16115 -- Added ModelAdmin.save_related method to be able to do pre- or post-save operations for objects related to the parent object currently displayed. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:43 +00:00
Luke Plant
cb996cce05 Fixed various bugs related to having multiple columns in admin list_display with the same sort field 
Thanks to julien for the report

Refs #11868

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-03 11:54:29 +00:00