Uriel Corfa
2baf04dee2
Add support for using different serializers for read and write ops in
...
ModelViewSets.
The feature is best described in docs/api-guide/generic-views.md,
complete with a use case, but basically this allows users to use a
nested serializer when displaying an object and a foreign key
serializer when updating/creating an object. This effectively allows
users of DRF to have something close to "read-write nested
serializers".
2014-05-27 19:43:07 -07:00
Tom Christie
708b6a6c06
Merge pull request #1596 from pipermerriam/piper/suport_unicode_model_references
...
`_resolve_model` should work with unicode strings
2014-05-23 09:01:13 +01:00
Piper Merriam
807f7a6bb9
Fix _resolve_model to work with unicode strings
2014-05-22 15:18:51 -06:00
Tom Christie
01e2a34210
Merge pull request #1594 from jcsp/wip-methodfield
...
fields: allow help_text on SerializerMethodField
2014-05-22 17:26:37 +01:00
John Spray
04c820b8e5
fields: allow help_text on SerializerMethodField
...
...by passing through any extra *args and **kwargs
to the parent constructor.
Previously one couldn't assign help_text to a
SerializerMethodField during construction.
2014-05-22 15:24:35 +01:00
Tom Christie
218b94e606
Merge pull request #1536 from Ian-Foote/choicefield_blank_display_value
...
Allow customising ChoiceField blank display value
2014-05-20 16:03:51 +01:00
Ian Foote
1e7b5fd2c0
Document ChoiceField blank_display_value parameter
2014-05-20 14:55:00 +01:00
Xavier Ordoquy
d46d153a99
Merge pull request #1589 from the5fire/fix-pep8
...
fix pep8
2014-05-19 07:38:06 +02:00
allenhu
a1a3ad7639
fix pep8
2014-05-19 09:53:05 +08:00
Xavier Ordoquy
af1ee3e631
Fixed a small change in the 1.7 beta url.
2014-05-18 09:38:46 +02:00
Xavier Ordoquy
a2e1024f8b
Updated Django versions.
2014-05-18 09:27:23 +02:00
Xavier Ordoquy
5c12b07681
Added missing import.
2014-05-16 19:40:02 +02:00
Xavier Ordoquy
a704d5a206
Fixed tests for python 3.4
2014-05-16 01:20:40 +02:00
Xavier Ordoquy
b370fb40b6
Typo in the Python version.
2014-05-16 01:06:34 +02:00
Xavier Ordoquy
e5556079fc
Updated tox with Python 2.4
2014-05-16 00:50:16 +02:00
Xavier Ordoquy
160fbbee0c
Merge remote-tracking branch 'frewsxcv/patch-1' into feature/python34
2014-05-16 00:33:49 +02:00
Xavier Ordoquy
eb15c25ba1
Merge pull request #1585 from glogiotatidis/master
...
Typo fix.
2014-05-15 23:58:52 +02:00
Giorgos Logiotatidis
768f537dcb
Typo fix.
2014-05-15 15:42:22 +03:00
Corey Farwell
8ecb778cd2
Enable testing on Python 3.4
2014-05-11 20:29:01 -07:00
Carlton Gibson
d69d975015
Merge pull request #1564 from alumni/master
...
Fixes #1535 (HTML widget missing `id` attribute)
2014-05-09 10:36:06 +02:00
Carlton Gibson
2768101441
Merge pull request #1576 from carltongibson/fix-#1575
...
Updated failing test from #1575
2014-05-08 11:41:33 +02:00
Carlton Gibson
0ff474d7c4
Updated failing test from #1575
2014-05-08 11:20:03 +02:00
Carlton Gibson
591d5240da
Merge pull request #1575 from ewdicus/iso8601
...
Add colon to time zone offset in readable_datetime_formats
2014-05-08 09:34:06 +02:00
Elliott
11115fde9c
Add colon to time zone offset in readable_datetime_formats
2014-05-07 11:37:20 -07:00
Tom Christie
4ce42fb72b
Merge pull request #1569 from sbellem/help-docs
...
Help docs
2014-05-06 15:33:40 +01:00
Sylvain Bellemare
e033a0b9a0
Replaced singular "is" by plural "are"
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
beb7253a96
Removed unnecessary "that"
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
9dc5e15e5a
Added missing "the" word
2014-05-06 15:08:53 +02:00
Lucian Mocanu
708c7b3a81
Added test case to check if the proper attributes are set on html widgets.
2014-05-06 14:17:51 +02:00
Carlton Gibson
8e78a38de5
Merge pull request #1485 from Atrasoftware/master
...
Use help_text, verbose_name, editable attributes for related fields
2014-05-06 13:43:15 +02:00
Carlton Gibson
0097fbc861
Merge pull request #1561 from incuna/i18n
...
Mark strings in AuthTokenSerializer as translatable
2014-05-06 10:53:06 +02:00
Tom Christie
28691f2cb1
Merge pull request #1567 from sbellem/help-docs
...
Help docs
2014-05-05 19:47:02 +01:00
Sylvain Bellemare
9e3ba939e1
Removed superfluous "./"s
2014-05-05 20:28:00 +02:00
Sylvain Bellemare
05fc974dc9
Added missing "the" word
2014-05-05 14:44:54 +02:00
Sylvain Bellemare
cdc7d19034
Added missing "to" word
2014-05-05 14:41:10 +02:00
Lucian Mocanu
4e33ff05d9
Automatically set the field name as value for the HTML id attribute on the rendered widget.
2014-05-04 00:12:08 +02:00
Charlie Denton
ccf3c508bd
Fix missing message in ValidationError
2014-05-02 21:58:49 +01:00
Charlie Denton
c15dab903d
Mark strings in AuthTokenSerializer as translatable
2014-05-01 10:18:16 +01:00
Xavier Ordoquy
5333a93126
Merge pull request #1409 from tuky/patch-1
...
remove spaces from META['HTTP_X_FORWARDED_FOR'] as throttle key
2014-04-30 21:38:21 +02:00
Xavier Ordoquy
d8fb81ceb1
Merge pull request #1391 from kaygorodov/master
...
Turning off pagination
2014-04-30 20:14:16 +02:00
Emanuele Pucciarelli
295a4ab62d
Added help_text to expected response in test
2014-04-29 22:16:11 +02:00
Emanuele Pucciarelli
fc44cd8d6a
Sync test result w/ new label
2014-04-29 21:45:57 +02:00
Emanuele Pucciarelli
f54399ea77
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
rest_framework/tests/models.py
2014-04-29 21:41:53 +02:00
Tom Christie
161270da99
Merge pull request #1553 from laurentbristiel/master
...
typo
2014-04-29 13:34:58 +01:00
Laurent Bristiel
d8cb85ef8f
typo
2014-04-28 22:00:36 +02:00
Tom Christie
1085b64fec
Merge pull request #1543 from sinitsynsv/master
...
Add help_text and verbose_name attribute mapping for related field
2014-04-28 20:23:12 +01:00
Xavier Ordoquy
ce2e55a513
Merge pull request #1552 from dpetzel/permissions_guide_response_typo
...
very minor typo in code example
2014-04-28 20:51:19 +02:00
dpetzel
5e8f05a8de
very minor typo in code example
2014-04-28 13:51:50 -04:00
Xavier Ordoquy
21810d2643
Merge pull request #1549 from maxpeterson/decode-generate-key
...
Ensure Token.generate_key returns a string.
2014-04-28 14:48:13 +02:00
Max Peterson
73597a16a2
Better Python < 3 compatibility.
2014-04-28 13:13:51 +01:00
