Daniel Greenfeld
ce835ffc79
Merge branch 'feature/save-options' of git://github.com/chrislawlor/django-admin2 into chrislawlor-feature/save-options
2013-05-21 23:18:53 +02:00
Chris Lawlor
f66ffe8c86
Use admin2_url, redirect create form to index view.
...
Uses the template tag admin2_url to create namespaced view names
from inside of views.
Create model form now redirects to the model index page, as
django.contrib.admin. does.
Removed get_success_url from ModelListView, as generic.ListView
does not call this method.
2013-05-21 14:01:30 -04:00
Andrew Ingram
262c759604
Merge remote-tracking branch 'origin/develop' into rename-templatetag-module
2013-05-21 00:05:25 +01:00
Andrew Ingram
3dcaeb4023
rename admin2_urls to admin2_tags
2013-05-20 23:45:22 +01:00
Daniel Greenfeld
0e03d7a5b0
bike shedding
2013-05-21 00:25:38 +02:00
Audrey Roy
55168a0ea0
Fix delete text to match original admin.
2013-05-20 23:33:37 +02:00
Chris Lawlor
f9a1540e09
Add 'title' and 'page_title' template blocks.
...
Makes template page title styling consistent across all templates.
2013-05-20 16:17:44 -04:00
Daniel Greenfeld
21a4f94359
Merge pull request #115 from chrislawlor/feature/template-context-refactor
...
Adds model name to AdminModel2Mixin template context.
2013-05-20 10:38:19 -07:00
Daniel Greenfeld
2b4449a769
Merge pull request #117 from chrislawlor/feature/model-create-page-title
...
Adds page title to model create page
2013-05-20 10:37:47 -07:00
Daniel Greenfeld
baf573bf11
Added immutable admin object per #99
2013-05-20 18:45:59 +02:00
Daniel Greenfeld
4f08ea2165
PEP-8 before working on #99
2013-05-20 18:09:58 +02:00
Daniel Greenfeld
b9ca57bd00
PEP-8 before working on #99
2013-05-20 18:04:51 +02:00
Chris Lawlor
3d2b347063
Adds model name to AdminModel2Mixin template context.
...
All views subclassing AdminModel2Mixin will need the model
name in their template context, so moving it to the base
class so child views don't all have to override
get_context_data.
2013-05-20 10:34:35 -04:00
Chris Lawlor
32f5e4802f
Adds page title to model create page
2013-05-20 09:07:19 -04:00
Chris Lawlor
c6c44bbdd0
Implements model save options, issue #110
2013-05-20 08:45:34 -04:00
Daniel Greenfeld
999eb32d74
Adding warnings about refactoring
2013-05-20 00:50:41 +02:00
Daniel Greenfeld
a2f73e0fb5
Merge pull request #108 from ludw/headerui
...
Header UI style
2013-05-19 15:46:32 -07:00
Daniel Greenfeld
83eb8da62a
Merge pull request #107 from ludw/master
...
Fixed small issue in modellistview
2013-05-19 15:45:57 -07:00
Ludvig Wadenstein
7c08296772
Fixed bug with modellist if more than one item
2013-05-19 20:56:41 +02:00
Ludvig Wadenstein
36491b4894
Replaced change password and logout links with dropdown
2013-05-19 20:46:14 +02:00
Daniel Greenfeld
234d2a9a6f
Prep for version 0.2.0
2013-05-19 17:23:58 +02:00
Daniel Greenfeld
6a351eb466
Merge pull request #104 from audreyr/edit-form-enhancements-72
...
Edit form improvement - part of #72
2013-05-19 08:18:57 -07:00
Daniel Greenfeld
4d44d3e534
warnings in models
2013-05-19 17:19:18 +02:00
Audrey Roy
b19b477888
Edit form improvement - part of #72
2013-05-19 17:13:20 +02:00
Daniel Greenfeld
0859342ae4
Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin
...
rename modeladmin to model_admin fixes #91
2013-05-19 07:30:40 -07:00
Raphael Kimmig
973ec97b2e
Merge remote-tracking branch 'upstream/master' into rename-modeladmin-model_admin
...
Conflicts:
djadmin2/core.py
djadmin2/templates/admin2/bootstrap/index.html
djadmin2/views.py
2013-05-19 15:45:24 +02:00
Gregor Müllegger
e745291445
Fixing issue that permissions cannot be hyperlinked from users and group API resource.
2013-05-19 15:32:51 +02:00
Raphael Kimmig
603db79ca1
rename modeladmin to model_admin fixes #91
2013-05-19 15:16:21 +02:00
Daniel Greenfeld
4f5eb65d5c
Merge pull request #92 from ludw/modellistui
...
Modellist UI cleaned up, #78
2013-05-19 06:05:57 -07:00
Daniel Greenfeld
0c1238dff6
Merge pull request #90 from gregmuellegger/rest-api-integration
...
Rest api integration
2013-05-19 05:48:51 -07:00
Daniel Greenfeld
7597e045a3
fix a merge mistake by yours truly.
2013-05-19 14:46:35 +02:00
Daniel Greenfeld
b4d4a6bde7
merge of @RaphaelKimmig's work
2013-05-19 14:44:27 +02:00
Daniel Greenfeld
594d6f9b27
Documentation and cleanup of core
2013-05-19 14:38:27 +02:00
Ludvig Wadenstein
bff0269729
Replaced edit detail delete with just a link to edit
2013-05-19 14:32:58 +02:00
Ludvig Wadenstein
ed9f1c3b69
More style changes on model list
2013-05-19 14:29:29 +02:00
Daniel Greenfeld
0e63bc8e7e
Merge branch 'master' of github.com:pydanny/django-admin2
2013-05-19 14:26:54 +02:00
Gregor Müllegger
cd625a6046
Fixing a bug that was introduced during rebasing.
2013-05-19 14:26:10 +02:00
Daniel Greenfeld
539dac9957
remove unnecessary exceptions file
2013-05-19 14:26:03 +02:00
Gregor Müllegger
dc0ecdfe0c
Adding a link to the API from the admin frontend.
2013-05-19 14:23:19 +02:00
Gregor Müllegger
0da7584e99
We don't need detail pages for apps in the API.
2013-05-19 14:23:18 +02:00
Gregor Müllegger
fe140bbf39
Integrating the new app registry so that the API can generate a nice index page.
2013-05-19 14:23:18 +02:00
Gregor Müllegger
4e03b7ce16
Fixing called function for API index view kwargs.
2013-05-19 14:23:18 +02:00
Gregor Müllegger
bc899a9389
Adding support for pagination.
2013-05-19 14:23:18 +02:00
Gregor Müllegger
8ea3b97786
Using django's TestCase and instead of the one from unittest.
2013-05-19 14:23:18 +02:00
Gregor Müllegger
631727d0f0
Tests for the API index view.
2013-05-19 14:23:18 +02:00
Gregor Müllegger
09dd2095e3
Fixing names for views beeing more consistent and tests for API views.
2013-05-19 14:22:50 +02:00
Gregor Müllegger
73a41f5632
Fixing tests for API.
2013-05-19 14:22:18 +02:00
Gregor Müllegger
68d6b96f84
Adding an index resource for the API.
2013-05-19 14:21:57 +02:00
Gregor Müllegger
a16faccade
Hyperlinking the API.
2013-05-19 14:21:21 +02:00
Gregor Müllegger
c7014282dc
Renaming 'api-index' view to 'api-list' makes more sense, since the index will be a list of all available models.
2013-05-19 14:21:21 +02:00
