mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Code Issues 30 Releases Wiki Activity
22,290 Commits 28 Branches 426 Tags 680 MiB
93a135d111
Commit Graph

91 Commits

Author SHA1 Message Date
Ramiro Morales
491419b5ff Made m2m fields form help_text munging specific to admin widgets. 
Refs #9321 and follow-up to e80de93af6.
 2014-03-22 15:43:17 -03:00
Tim Graham
e80de93af6 Removed hard-coded help_text for ManyToManyFields that use a SelectMultiple widget 
Per deprecation timeline; refs #9321.
 2014-03-21 19:10:07 -04:00
Marc Tamlyn
2607fa9016 Fixed #21774 -- Isolate all test urls from eachother. 
This (nearly) completes the work to isolate all the test modules from
each other. This is now more important as importing models from another
module will case PendingDeprecationWarnings if those modules are not in
INSTALLED_APPS. The only remaining obvious dependencies are:

- d.c.auth depends on d.c.admin (because of the is_admin flag to some
  views), but this is not so important and d.c.admin is in
  always_installed_apps
- test_client_regress depends on test_client. Eventually these should
  become a single module, as the split serves no useful purpose.
 2014-01-14 15:43:27 +00:00
Florian Apolloner
3bc6b18cb9 Fixed selenium failure. 
This fixes (at least according to tests on the ci itself)
admin_widgets.tests.RelatedFieldWidgetSeleniumFirefoxTests.test_foreign_key_using_to_field

(http://ci.djangoproject.com/job/Django/database=mysql_gis,python=python2.7/3792/testReport/junit/admin_widgets.tests/RelatedFieldWidgetSeleniumFirefoxTests/test_foreign_key_using_to_field/)

The cause for this issue seems to be that wait_page_loaded was executed before click fired
and as such no profile got saved (again just an educated guess, but with this fix I can no
longer reproduce it -- fingers crossed).
 2014-01-03 11:29:37 +01:00
Florian Apolloner
ed2828f0a0 Fixed a few flaky selenium tests. 
Many thanks go to David Burns (@AutomatedTester) for helping me understand
css selectors and pointing me towards the correct selenium methods.
 2014-01-03 00:36:50 +01:00
Aymeric Augustin
e32095616c Imported override_settings from its new location. 2013-12-23 21:37:56 +01:00
Jason Myers
4f151da1e5 Merging in master 
Signed-off-by: Jason Myers <jason@jasonamyers.com>
 2013-11-03 07:19:25 -06:00
Aymeric Augustin
881851f3bb Merge pull request #1853 from loic/dst 
Fixed failing test around DST change.
 2013-11-03 01:14:17 -07:00
Jason Myers
7a61c68c50 PEP8 cleanup 
Signed-off-by: Jason Myers <jason@jasonamyers.com>
 2013-11-02 23:50:49 -05:00
coagulant
8eec2d93b6 Fixed all E261 warnings 2013-11-02 23:50:33 -05:00
Loic Bistuer
757945b47d Fixed failing test around DST change. 
The timezone arithmetic done in JS can be off by one hour around DST
change. We work around this issue by adding one extra hour to the test
error margin when we detect a DST change is near.

Refs #20663.
 2013-11-02 18:57:35 -05:00
coagulant
3bc0d46a84 Fixed all E261 warnings 2013-11-02 18:20:39 -04:00
Alex Gaynor
9d740eb8b1 Fix all violators of E231 2013-10-26 12:15:03 -07:00
Tim Graham
ae48d77ef8 Fixed E225 pep8 warnings. 2013-10-23 06:09:29 -04:00
Alasdair Nicol
b289fcf1bf Fixed #21288 -- Fixed E126 pep8 warnings 2013-10-21 08:31:30 -04:00
Alasdair Nicol
bab9123daa Fixed #21268 -- Fixed E303 pep8 warnings 2013-10-18 01:46:24 +01:00
Alasdair Nicol
65d1d65d52 Fixed #21267 -- Fixed E502 pep8 warnings 2013-10-18 01:28:32 +01:00
Larry O'Neill
83b9bfea44 Fixed #21266 -- Fixed E201,E202 pep8 warnings. 2013-10-14 18:12:00 -04:00
Tim Graham
b67ab75e82 Fixed assorted flake8 errors. 2013-10-11 07:25:14 -04:00
Tim Graham
1dae4ac177 Whitespace cleanup. 
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
 2013-10-10 16:49:20 -04:00
Florian Apolloner
351a061497 Fixed a timing edge case in the RelatedFieldWidgetSeleniumFirefoxTests. 
By settings an implicit wait timeout for the find_* methods we can wait
till the javascript code add the new option to the DOM.

See http://ci.djangoproject.com/job/Django/database=mysql_gis,python=python3.3/3174/testReport/junit/admin_widgets.tests/RelatedFieldWidgetSeleniumFirefoxTests/test_foreign_key_using_to_field/

Stacktrace:
Traceback (most recent call last):
  File "/var/lib/jenkins/jobs/Django/workspace/database/mysql_gis/python/python3.3/tests/admin_widgets/tests.py", line 1060, in test_foreign_key_using_to_field
      self.assertEqual(username_value, new_option.get_attribute('value'))
      AssertionError: 'newuser' != 'testser'
      - newuser
      + testser
 2013-09-15 01:11:07 +02:00
Roberto Aguilar
af67ce5e18 Fixed #4574 -- Added CSS classes to the admin calendar widget for better control over styling. 2013-09-10 08:07:17 -05:00
Julien Phalip
55a11683f7 Fixed #20836 -- Ensure that the ForeignKey's to_field attribute is properly considered by the admin's interface when creating related objects. 
Many thanks to Collin Anderson for the report and patch and to Peter Sheats for the test.
 2013-09-07 12:14:07 -05:00
Rudy Mutter
c438cc2a36 Fixed #20821 -- Added tooltips to Admin SelectBox widget 
The Admin widget, which can be used to filter multiple selects
can sometimes be too narrow and hide information such as
user permissions. This commit adds tooltips to the select
options so that a user can hover over and see the hidden text.
 2013-09-06 15:46:38 -05:00
Tim Graham
5649c0af9d Fixed "indentation is not a multiple of four" pep8 issues. 2013-09-03 14:22:21 -04:00
Lukasz Balcerzak
9d1987d767 Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices 2013-08-22 11:50:52 -04:00
Claude Paroz
165f44aaaa Combine consecutive with statements 
Python 2.7 allows to combine several 'with' instructions.
 2013-08-16 20:12:10 +02:00
Florian Apolloner
4e50e40654 Removed unneeded conditional_escapes from the testsuite. 2013-08-13 22:22:46 +02:00
Jacob Kaplan-Moss
cbe6d5568f Apply autoescaping to AdminURLFieldWidget. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:06:41 -05:00
Collin Anderson
d53e574676 Fixed #20865 -- Fixed raw_id_fields to work with callable limit_choices_to. 2013-08-06 13:41:52 -04:00
Julien Phalip
f067887a4f Fixed some intermittent Selenium test failures. 2013-08-04 22:03:53 -07:00
Julien Phalip
995ffbb2a6 Added some Selenium tests for the admin raw id widget. 2013-08-04 16:08:45 -07:00
Claude Paroz
5c1143910e Removed most of absolute_import imports 
Should be unneeded with Python 2.7 and up.
Added some unicode_literals along the way.
 2013-07-29 20:28:13 +02:00
Tim Graham
2a979d2a7b Updated contrib.admin to use Email/URLInputs; refs #16630 2013-07-26 07:22:30 -04:00
Loic Bistuer
7e6d852bac Fixed #20663 -- "Today" and "now" admin shortcuts. 
Changed the shortcuts next to date and time intput widgets
to account for the current timezone.

Refs #7717, #14253 and #18768.
 2013-07-09 23:04:33 +02:00
Aymeric Augustin
cfcf4b3605 Stopped using django.utils.unittest in the test suite. 
Refs #20680.
 2013-07-01 14:29:33 +02:00
Aymeric Augustin
dfcce4288a Fixed available_apps for selenium tests. 
Refs #20483.
 2013-06-10 12:11:46 +02:00
Ramiro Morales
8c2fd050f8 Made fix for #9321 less buggy and more effective. 
Don't try to be smart about building a good-looking help string
because it evaluates translations too early, simply use the same old
strategy as before. Thanks Donald Stufft for the report.

Also, actually fix the case reported by the OP by special-casing
CheckboxSelectMultiple.

Added tests.

Refs #9321.
 2013-05-23 07:49:29 -03:00
Loic Bistuer
6983a1a540 Fixed #15363 -- Renamed and normalized to get_queryset the methods that return a QuerySet. 2013-03-08 10:11:45 -05:00
Florian Apolloner
33836cf88d Renamed some tests and removed references to modeltests/regressiontests. 2013-02-26 14:36:57 +01:00
Florian Apolloner
89f40e3624 Merged regressiontests and modeltests into the test root. 2013-02-26 14:36:57 +01:00