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

6509 Commits

Author SHA1 Message Date
Tim Graham d0b18542f7 [1.8.x] Fixed gis_tests when run without GIS dependencies. 
Backport of ed336a1a5d from master
 2015-04-16 20:01:30 -04:00
Anssi Kääriäinen 581afddc77 [1.8.x] Fixed #24605 -- Fixed incorrect reference to alias in subquery. 
Thanks to charettes and priidukull for investigating the issue, and to
kurevin for the report.

Backport of 355c5edd93 from master
 2015-04-16 09:31:29 -04:00
Anssi Kääriäinen 70ff455a35 [1.8.x] Fixed #24615 -- ordering by expression not part of SELECT 
Fixed queries where an expression was used in order_by() but the
expression wasn't in the query's select clause (for example the
expression could be masked by .values() call)

Thanks to Trac alias MattBlack85 for the report.
Backport of fb5c7748da from master.
 2015-04-16 09:42:42 +02:00
Jon Dufresne c38d8f0f87 [1.8.x] Fixed model_fields tests to use django TestCase. 
Backport of 97bb48d9ba from master
 2015-04-15 08:19:55 -04:00
Markus Holtermann 584c6591a3 [1.8.x] Refs #24625 -- Filtered docutils warnings output in tests 
Instead of setting ``warning_stream`` in the docutils config overrides
to ``False`` I opted for filtering the stderr in the tests to keep the
error output showing up in server logs.

Thanks Tim Graham for the report and review

Backport of 3caf7efb44 from master
 2015-04-14 11:27:57 +02:00
Jay Wineinger 496800b3bf [1.8.x] Fixed #24611 -- Fixed update() crash with related UUID pk object. 
Backport of 923da0274a from master
 2015-04-13 12:20:41 -04:00
Markus Holtermann 3862826fed [1.8.x] Fixed #24625 -- Prevented arbitrary file inclusion in admindocs 
Thanks Tim Graham for the review.

Backport of 09595b4fc6 from master
 2015-04-11 21:12:09 +02:00
Claude Paroz 774d09a7dd [1.8.x] Fixed #24624 -- Replaced obsoleted rel.opts in admindocs view 
Thanks Scott Sanders for the report, and Markus Holtermann and
Tim Graham for the reviews. Refs #24381.
Backport of 4e7ed8d0d from master.
 2015-04-11 15:34:02 +02:00
Tim Graham b1dc128a03 [1.8.x] Fixed #24578 -- Fixed crash with QuerySet.update() on FK to O2O fields. 
Thanks Anssi Kääriäinen for review.

Backport of 10b4c010ab2cdaa6ba8bfaec3e3540299ea77be from master
 2015-04-09 08:24:07 -04:00
Patryk Zawadzki 9f632dc702 [1.8.x] Fixed #24513 -- Made sure a model is only rendered once during reloads 
This also prevents state modifications from corrupting previous states.
Previously, when a model defining a relation was unregistered first,
clearing the cache would cause its related models' _meta to be cleared
and would result in the old models losing track of their relations.

Backport of 0385dad073 from master
 2015-04-07 14:56:33 +02:00
Jon Dufresne 551d4bb46a [1.8.x] Fixed #24584 -- Fixed microsecond handling with older MySQLdb 
Backport of 2cf58e80d from master.
 2015-04-06 22:45:36 +02:00
Marten Kenbeek 773387ce42 [1.8.x] Fixed #24278 -- Fixed serialization of migration operations. 
Fixed MigrationWriter.serialize() to correctly handle migration
operations by utilizing OperationWriter.

Thanks Piotr Maliński for the report.

Backport of e8e4f978dd from master
 2015-04-05 20:29:27 +02:00
Marten Kenbeek 651cc369ad [1.8.x] Refs #24278 -- Allowed multi-line serializations in OperationWriter. 
Changed OperationWriter to support multi-line serialized values with
correct indentation.

Backport of d597174bd4 from master
 2015-04-05 20:29:21 +02:00
Tim Graham 3313156d8e [1.8.x] Fixed flake8 warning. 2015-04-04 07:50:53 -04:00
Claude Paroz 3a76276212 [1.8.x] Fixed #24569 -- Made some translation functions accept None value 
get_language() can return None when translations are deactivated.
Thanks Nicola Peduzzi for the reporti and Tim Graham for the review.
Backport of 7a0d9b5cda from master.
 2015-04-04 10:58:54 +02:00
Claude Paroz 7821f856a6 [1.8.x] Fixed #24571 -- Restored testserver positional arguments parsing 
Thanks Domas Lapinskas for the report and Tim Graham for the
review.
Backport of 426b63ba04 from master.
 2015-04-04 10:48:40 +02:00
Baptiste Mispelon 09188b5024 [1.8.x] Fixed #24566 -- Added support for serializing timedelta 
Thanks to knbk for the report.

Backport of 30a3c2f74c from master.
 2015-04-02 17:41:08 +02:00
Tim Graham e7366ab1f9 [1.8.x] Fixed mistakes in tests unveiled by version bump to 1.8.1. 2015-04-02 07:01:42 -04:00
Claude Paroz 70c5031d56 [1.8.x] Adapted form regression test to new translations 
Backport of 2112b7d78 from master.
 2015-04-01 19:53:11 +02:00
Tim Graham 5a4f95805f [1.8.x] Refs #24538 -- Simplified a test per Aymeric's feedback. 
Backport of a184a99123 from master
 2015-04-01 13:19:57 -04:00
Tim Graham 5c63c45512 [1.8.x] Fixed #23441, #24555 -- Improved the behavior of InclusionNode. 
This change:

* Makes the InclusionNode cache-safe by removing render-time side effects
  to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
  the render call to use Template.render rather than Nodelist.render.

Backport of 0808ccce38 from master
 2015-04-01 13:12:18 -04:00
Tim Heap ff8eabc5cc [1.8.x] Fixed #24538 -- Allowed self in Jinja context 
Rendering a Jinja template with self in the context threw an error.
While self is a reserved variable in Jinja, including self in the
context is not an error, so Django should respect that.

Backport of 4ea1909d3c from master
 2015-04-01 12:27:52 -04:00
Tim Graham 7b9f7b6670 [1.8.x] Fixed sessions test on Python 3.5; refs #23763. 
SimpleCookie.__repr__() changed in
https://hg.python.org/cpython/rev/88e1151e8e02

Backport of 4e59156c10 from master
 2015-03-31 08:41:31 -04:00
Tim Graham c0102dc7ff [1.8.x] Fixed skipping of gis_tests when dependencies not installed. 
Backport of ba1665ed75 from master
 2015-03-28 09:39:49 -04:00
Moritz Sichert 44a05a8a91 [1.8.x] Fixed #24469 -- Refined escaping of Django's form elements in non-Django templates. 
Backport of 1f2abf784a from master
 2015-03-27 20:01:41 -04:00
Varun Sharma 8f5e8ab666 [1.8.x] Added test for LogEntry.get_edited_object(); refs #24244. 
Backport of 74f8110e74 from master
 2015-03-23 08:52:32 -04:00
Bas Peschier 015a9b928a [1.8.x] Fixed #13525 -- Added tests and docs for nested parameters in URL patterns. 
When reversing, only outer parameters are used if captured parameters are
nested. Added tests to check the edge cases and documentation for the
behavior with an example to avoid it.

Backport of 23a5d64f40 from master
 2015-03-23 08:43:58 -04:00
Tim Graham ce6062dbd9 [1.8.x] Fixed backport of refs #24485 tests. 2015-03-22 16:14:15 -04:00
Josh Smeaton e654123f7f Fixed #24485 -- Allowed combined expressions to set output_field 2015-03-22 17:41:12 +11:00
Josh Smeaton 3a1886d111 [1.8.x] Fixed #24508 -- Made annotations commutative 
Backport of 127b3873d0 from master
 2015-03-22 17:35:22 +11:00
Claude Paroz 8e4b0d6010 [1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling 
Backport of 9e83f30cd3 from master.
 2015-03-21 10:29:22 +01:00
Tim Graham 770427c289 [1.8.x] Made is_safe_url() reject URLs that start with control characters. 
This is a security fix; disclosure to follow shortly.
 2015-03-18 19:23:21 -04:00
Tim Graham 5447709a57 [1.8.x] Fixed an infinite loop possibility in strip_tags(). 
This is a security fix; disclosure to follow shortly.
 2015-03-18 19:23:21 -04:00
Karl Hobley a8c53041f9 [1.8.x] Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed. 
Backport of 81e1a35c36 from master
 2015-03-18 19:12:46 -04:00
Tim Graham 247251c2e1 [1.8.x] Refs #24483 -- Added a test for deconstruction of Field.choices 
Backport of b4a56ed4f5 from master
 2015-03-18 13:56:33 -04:00
Moritz Sichert 571e093a25 [1.8.x] Refs #24469 -- Fixed escaping of forms, fields, and media in non-Django templates. 
Backport of 6bff343989 from master
 2015-03-18 09:11:44 -04:00
Josh Smeaton a0cebe82b5 [1.8.x] Refs #24485 -- Renamed some expression types 
Backport of 88d798d71a from master
 2015-03-17 08:40:45 -04:00
Josh Smeaton 34e09e532d [1.8.x] Fixed #24486 -- Fixed error with datetime and DurationField arithmetic 
Backport of ff2aa40192 from master
 2015-03-17 08:36:15 -04:00
John Giannelos e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging. 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
 2015-03-16 19:45:55 -04:00
Marten Kenbeek febcbbf89d [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1. 
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.

Backport of 818182b514 from master
 2015-03-16 13:31:22 -04:00
Matthew Wilkes 22a67d22e9 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 
Forwardport of test and release note from stable/1.7.x

Backport of ae87ad005f from master
 2015-03-14 15:47:10 -04:00
Tim Graham aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter. 
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.

Backport of 7b1a67cce5 from master
 2015-03-10 19:12:20 -04:00
Baptiste Mispelon 35d68e8e76 [1.8.x] Refs #24461 -- Added test/release notes for XSS issue in ModelAdmin.readonly_fields 
This issue was fixed by refs #24464.
 2015-03-09 10:15:12 -04:00
Erik Romijn d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape their input by default. 
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.

Thanks Markus Holtermann for help with tests and docs.

Backport of fa350e2f30 from master
 2015-03-09 09:31:07 -04:00
Anssi Kääriäinen 3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions 
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c4 from master
 2015-03-09 07:51:05 -04:00
Aymeric Augustin 311b880fa9 [1.8.x] Prevented some tests from writing in the CWD. 
Backport of 90b069c33f from master
 2015-03-07 10:40:17 -05:00
Jean-Louis Fuchs 1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns 
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060fea from master
 2015-03-07 14:15:27 +01:00
Claude Paroz ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings 
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
 2015-03-06 22:22:51 +01:00
Josh Smeaton 823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions 
Backport of ceaf31adff from master
 2015-03-06 13:31:43 +11:00
Tim Graham 20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False. 
Backport of 36a17be9f3 from master
 2015-03-04 13:56:51 -05:00