mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 19 Releases Wiki Activity
15,708 Commits 28 Branches 421 Tags 659 MiB
Commit Graph

4568 Commits

Author SHA1 Message Date
Russell Keith-Magee 122020fdb9 Merge pull request #1579 from ianawilson/ticket_21058 
Fixed #21058 -- Fixed debug view blowing up when no template is provided to the template rendering functions.

Assistance on this commit from @jambonrose.
 2013-09-06 15:06:57 -07:00
Ian Wilson e12de0ac04 Removed unnecessary, leftover imports 2013-09-06 22:04:58 +00:00
Adrian Holovaty e844e10b4f Moved a settings usage up the stack in utils/formats.py #unsettings 2013-09-06 17:01:36 -05:00
Julien Phalip d5df914fe1 Merge pull request #1578 from rmutter/ticket_20821 
Fixed #20821 -- Added tooltips to Admin SelectBox widget
 2013-09-06 14:03:58 -07:00
Ian Wilson 9b7f4aab32 adds fix and test for when a template is not specified at all to render(). fixes #21058. by jambonrose and ianawilson 2013-09-06 15:50:18 -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
Andrew Godwin efd1e6096e Adding 'sqlmigrate' command and quote_parameter to support it. 2013-09-06 15:28:12 -05:00
Dan Johnson df462cf760 Fixed #21043 -- Made resolve() handle reverse_lazy objects. 
Thanks Keryn Knight for the report.
 2013-09-06 15:46:43 -04:00
Florian Apolloner 85359ec9a4 Merge branch 't20812' 2013-09-06 21:03:46 +02:00
Daniel Langer cc957cb16c Fixed #4287 -- Fixed NaN and +/- Infinity handling in FloatField 
NaN, +Inf, and -Inf are no longer valid values for FloatFields.
 2013-09-06 14:56:37 -04:00
Andrew Godwin 05e14e8eaf Migration autodetector now corerctly deals with proxy models 2013-09-06 12:39:46 -05:00
Florian Apolloner 2326dedde8 Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type. 2013-09-06 19:24:18 +02:00
Andrew Godwin be983ee403 Also test failure case of ProjectState dependency resolution 2013-09-06 12:18:24 -05:00
Andrew Godwin cdeff3acc2 Project/ModelState now correctly serialize multi-model inheritance 2013-09-06 12:16:03 -05:00
Andrew Godwin 6f7977bb63 Fixed #21029: Test for previously-commited SchemaEditor.__exit__ bug. 2013-09-06 12:16:03 -05:00
Chris Wilson eade315da1 Fixed #10164 -- Made AutoField increase monotonically on SQLite 
Thanks malte for the report.
 2013-09-06 12:31:17 -04:00
Aymeric Augustin e492ab8e7e Fixed #18719 -- Made force_bytes more consistent with force_text. 2013-09-06 10:28:28 -05:00
Markus Holtermann bd8e1a354c Fixed #20977 -- Fixed writing migrations to disk on Python 3 2013-09-06 09:51:58 -04:00
Preston Timmons 8625c7aab3 Fixed #16096 -- Added origin attribute to template instances. 
Thanks jdunck for the suggestion.
 2013-09-06 09:14:52 -04:00
Loic Bistuer e1266e50b2 Fixed #21015 -- Fixed MigrationLoader when importlib.import_module returns a file module or an empty directory. 2013-09-06 08:30:19 -04:00
Loic Bistuer 82bbb9fe81 Fixed #21014 -- Fixed gobbled ImportError in MigrationLoader. 2013-09-06 08:30:18 -04:00
Eric Boersma 4d13cc56de Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
 2013-09-05 20:14:58 -04:00
Aymeric Augustin 6a6428a36f Took advantage of django.utils.six.moves.urllib.*. 2013-09-05 14:39:23 -05:00
Tim Graham bab039d74c Fixed #21041 -- Removed a duplicate form in tests. 
Thanks tuxcanfly.
 2013-09-05 05:49:10 -04:00
Loic Bistuer 34d52fd32e Fixed #21010 -- Changed ModelState to only copy _meta.local_fields. 2013-09-04 14:05:59 -04:00
Tim Graham 5649c0af9d Fixed "indentation is not a multiple of four" pep8 issues. 2013-09-03 14:22:21 -04:00
Tim Graham cb98ffe8f4 Fixed a couple unclosed file warnings in tests 2013-09-03 13:37:27 -04:00
Tim Graham 3db66b1d65 Updated syncdb -> migrate in tests. 2013-09-03 11:51:34 -04:00
Tim Graham 86964a7b4f Silenced deprecation warning regarding old SQL location; refs #14300 2013-09-03 11:10:43 -04:00
Tim Graham 2fd03b39ab Removed references to django.utils.unittest which is PendingDeprecation 2013-09-03 09:55:21 -04:00
Tim Graham ec784c486b Silenced deprecation warnings in SortedDict tests; refs [07876cf02b] 2013-09-03 09:48:46 -04:00
Aymeric Augustin 365c3e8b73 Replaced "not PY3" by "PY2", new in six 1.4.0. 2013-09-02 12:11:02 +02:00
Ramiro Morales 41feab3654 Converted tests for admin first form widget auto-focus to Selenium. 
Refs #1707 and 1c0c879be3.
 2013-09-01 15:07:08 -03:00
Ramiro Morales c01cd4c423 Change test added in 3e34005b1b to be more stable. 
It could fail when actual serialization JSON field ordering was
different from the hard-coded one. Refs #13182.
 2013-09-01 10:47:35 -03:00
Loic Bistuer ff9e116198 Fixed #21008 -- Made MigrationWriter handle Promise objects. 2013-08-31 20:26:44 -04:00
Ramiro Morales e909ceae9b Made django.test.testcases not depend on staticfiles contrib app. 
Do this by introducing a django.contrib.staticfiles.testing.StaticLiveServerCase
unittest TestCase subclass.

Fixes #20739.
 2013-08-31 11:02:32 -03:00
Claude Paroz e0643cb676 Properly skipped yaml tests when not installed 2013-08-31 15:23:56 +02:00
Claude Paroz 3e34005b1b Fixed #13182 -- Prevented trailing spaces in indented json output 
Thanks Stéphane Raimbault for the report and the initial patch.
 2013-08-31 15:18:01 +02:00
Carl Meyer 7211741fc5 Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions. 
Refs #18162. Thanks claudep and mjtamlyn for review.
 2013-08-30 17:43:10 -06:00
Claude Paroz b04f8ddbaa Fixed #21005 -- Made schema tests language-independent 
Thanks Simon Charette for the review.
 2013-08-30 21:28:21 +02:00
Simon Charette 11cd7388f7 Fixed #20989 -- Removed useless explicit list comprehensions. 2013-08-30 10:57:51 -04:00
Curtis Maloney e2f06226ea Improved {% include %} implementation 
Merged BaseIncludeNode, ConstantIncludeNode and Include node.

This avoids raising TemplateDoesNotExist at parsing time, allows recursion
when passing a literal template name, and should make TEMPLATE_DEBUG behavior
consistant.

Thanks loic84 for help with the tests.

Fixed #3544, fixed #12064, fixed #16147
 2013-08-30 10:36:36 +03:00
Anssi Kääriäinen e973ee6a98 Fixed #20988 -- Added model meta option select_on_save 
The option can be used to force pre 1.6 style SELECT on save behaviour.
This is needed in case the database returns zero updated rows even if
there is a matching row in the DB. One such case is PostgreSQL update
trigger that returns NULL.

Reviewed by Tim Graham.

Refs #16649
 2013-08-30 09:41:07 +03:00
Simon Charette 36bbe3b7c5 Altered test introduced in f19a3669b8 for the sake of readability. refs #14786 2013-08-29 14:50:55 -04:00
Tim Graham f19a3669b8 Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value twice if prepared is False. 
Thanks homm for the report and Aramgutang and lrekucki for work on
the patch.
 2013-08-29 11:13:34 -04:00
Tim Graham af953c45cc Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash. 
Thanks chris at cogdon.org for the report and admackin for the patch.
 2013-08-29 09:39:31 -04:00
Tim Graham cf8d6e9108 Fixed #20881 -- Removed contrib.auth.models.AbstractUser.get_absolute_url() 
The definition is arbitrary and creates a broken "view on site"
link in the admin if a project doesn't define such a URL.
 2013-08-29 06:36:35 -04:00
Curtis Maloney 8d473b2c54 Fixed #7116 -- Optimize RequestContext construction 2013-08-29 10:25:56 +03:00
Curtis Maloney 5cdacbda03 Fixed #17356 -- Allowed {% include %} to render compiled templates 
Reviewed by Loic Bistuer and Tim Graham.
 2013-08-29 10:22:24 +03:00
Loic Bistuer da800be6dd Fixed #20986 -- Enabled SelectDateWidget to use custom months 
Reviewed by Trac alias MarkusH.
 2013-08-28 16:39:26 +03:00