Wade Austin
4b8b8d8b47
Fix for Issue #178
...
If an action is selected and no objects are selected the message "Items must be selected in order to perform actions on them. No items have been changed." is displayed instead of the user being sent to Action confirmation screen.
2013-06-03 21:09:41 -05:00
Daniel Greenfeld
45855f9b50
German to English 😉
2013-06-03 23:30:48 +02:00
Daniel Greenfeld
5be8972dac
Merge branch 'modellist-170' of git://github.com/ludw/django-admin2 into ludw-modellist-170
2013-06-03 23:26:42 +02:00
Audrey Roy
b3bb9dbf82
Merge pull request #177 from audreyr/develop
...
Merge in @paurosello's commit
2013-06-03 14:05:39 -07:00
Audrey Roy
03d5ed03f5
Fix merge conflict. Remove extrajs block.
2013-06-03 22:51:15 +02:00
Audrey Roy
cc6e8467c4
Rename constants module to settings
2013-06-03 22:44:16 +02:00
paurosello
b0a8594990
Trying to fix issue #173 .
...
Every block is finished with it's own name.
2013-06-03 22:28:41 +02:00
Daniel Greenfeld
d140086dd1
fixes #172
2013-06-03 20:46:17 +02:00
Ludvig Wadenstein
a802dfe8ae
Replaced actions select with button dropdown.
2013-06-02 20:58:27 +02:00
Ludvig Wadenstein
574037acfe
Chackbox column has apropriate width
2013-06-02 20:18:47 +02:00
Ludvig Wadenstein
c45a544a1d
List row links to update or read page based on permissions
2013-06-02 20:17:04 +02:00
Daniel Greenfeld
d52bc0fe15
Document actions
2013-06-01 19:23:15 +02:00
Daniel Greenfeld
7827bf0003
fixes #159 and lays the ground for more things
2013-06-01 18:02:01 +02:00
Daniel Greenfeld
972968b5b1
Move towards internal consistency of URL name definitions
2013-06-01 13:48:53 +02:00
Audrey Roy
d72d7e4deb
Fix error on create from this form.
2013-06-01 12:54:15 +02:00
Audrey Roy
f2c8480a2f
Merge pull request #167 from audreyr/develop
...
Document custom CSS better.
2013-06-01 03:36:36 -07:00
Audrey Roy
68c5f11b85
Document custom CSS better.
2013-06-01 12:35:49 +02:00
Audrey Roy
b389af9bb9
Add delete button to edit form as per issue #72 .
2013-05-31 22:21:04 +02:00
Daniel Greenfeld
f822eedae9
merge
2013-05-31 17:41:20 +02:00
Daniel Greenfeld
83689f37d6
merge
2013-05-31 17:40:25 +02:00
Daniel Greenfeld
1195f38b84
More work on admin
2013-05-31 17:38:34 +02:00
Daniel Greenfeld
0da6f453b7
For #161 , this removes the FBV and implements an easily extendible BaseListAction class
2013-05-31 16:47:25 +02:00
Daniel Greenfeld
1916f7cba4
Change list actions to be list_actions so their nature is more explicit
2013-05-31 15:37:55 +02:00
Gregor Müllegger
0690385b4c
Fixes #160 -- Marking a few missed strings as translatable.
2013-05-31 15:37:43 +02:00
Daniel Greenfeld
16c9b8c3ee
prep for v0.3.0
2013-05-31 10:21:02 +02:00
Daniel Greenfeld
be07421d44
Removed admins.py and placed calls to ModelAdmin2 from top namespace
2013-05-31 08:57:25 +02:00
Daniel Greenfeld
bf1657990a
replace django.contrib.admin introduced in last pull request with our own native form
2013-05-31 08:49:24 +02:00
Daniel Greenfeld
fd6c0a57b3
Added Roman Gladkov as a contributor, PEP8 and djadmin2 standards fixes
2013-05-31 08:36:09 +02:00
d1ffuz0r
db939ef753
fixed names
2013-05-31 08:25:45 +07:00
d1ffuz0r
8dd3cd4133
added tests
2013-05-31 08:21:43 +07:00
d1ffuz0r
b54c28afc1
deleted LoginRequiredMixin
2013-05-31 07:39:58 +07:00
d1ffuz0r
b8413f96e3
change password form dependent from user
2013-05-31 07:24:22 +07:00
d1ffuz0r
2b172fdcc2
merge from develop
2013-05-31 06:55:34 +07:00
d1ffuz0r
6c0978189a
login view
2013-05-31 06:20:39 +07:00
d1ffuz0r
17bc5acecf
use django-braces for login required views
2013-05-31 06:20:15 +07:00
d1ffuz0r
8ae0644fb9
#101 #103 added change password, logout views
2013-05-31 06:19:33 +07:00
Daniel Greenfeld
9acdf9e2f8
fixes #155 , which is moving models.py to types.py. Using admins.py as an alias for the old models.py module
2013-05-30 12:33:00 +02:00
Daniel Greenfeld
096267c674
New immutable object type that is properly frozen. Part of #155
2013-05-30 12:11:49 +02:00
Daniel Greenfeld
b2fb02b976
New immutable object type that is properly frozen. Part of #155
2013-05-30 12:11:19 +02:00
Daniel Greenfeld
30d1abe5d4
PEP-8 work
2013-05-30 11:35:58 +02:00
Ben Tappin
06302a7ed6
Tweak NestedObjects (and tests) comments.
2013-05-29 14:10:56 +01:00
Ben Tappin
f4f400734c
Use utils.model_options() in views and change utils import.
2013-05-29 14:09:26 +01:00
Ben Tappin
65de6f148f
Use utils.model_options().
2013-05-29 13:50:07 +01:00
Ben Tappin
11f193ffc9
UI improvements when deleting objects.
...
Shows nested child objects that will be deleted when deleting a single object or multiple objects.
Includes some hacky tests for NestedObjects in the example app.
2013-05-29 12:38:32 +01:00
Daniel Greenfeld
5fcccb6183
Remove print statement. Fixes #143
2013-05-29 12:17:08 +02:00
Gregor Müllegger
b54048c744
Re-wording the variable 'backend' based on @RaphaelKimmig's code review.
2013-05-29 11:00:59 +02:00
Gregor Müllegger
c0a3df680c
Fix permission denied errors for API views.
2013-05-29 10:47:45 +02:00
Gregor Müllegger
42d89a7585
Moving permission checking from AdminModel2Mixin to PermissionMixin were it belongs.
2013-05-29 10:47:45 +02:00
Gregor Müllegger
2771d160a7
Using new permission handling in templates.
2013-05-29 10:47:45 +02:00
Gregor Müllegger
8c88362197
Removing old permission handling.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
d0635b79c3
Adding a IsSuperuserPermission class.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
02a68faadd
Adding more information to the docstring of the template permission handler.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
635bbca553
Adding |for_view filter to bind permissions for a view name.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
9ce77ae572
Adding possibility to traverse permissions by admin name.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
2aca9df7e2
Adding possibility to swap model admin that is checked for permissions in the template.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
c6a11efca8
Adding ability to check for permissions of any registered model admin in the templates.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
e7cadd5ab5
Allow ModelAdmin2 instances to have names.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
65d54083ce
Adding reference documentation for permission handling.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
ab778191c6
Adding the ability to check for permissions in templates.
2013-05-29 10:44:22 +02:00
Gregor Müllegger
324cdbaa17
Moving permission logic of views into its own mixin. Also allow to check permission on other views via the PermissionMixin.
2013-05-29 10:43:09 +02:00
Gregor Müllegger
0c7615b733
Implementing a class-based permission handling.
2013-05-29 10:43:09 +02:00
Andrew Ingram
23b0389c1a
Rename app-index view to app_index
2013-05-28 13:24:18 +01:00
Andrew Ingram
3bb555fb56
add missing test for utils.model_app_label
2013-05-28 13:24:02 +01:00
Andrew Ingram
9f41c3f56e
Initial stab at breadcrumbs
...
There's currently a lot of copy-pasting of breadcrumbs, this can be revisited once we have a better understanding of how we're going to handle navigation.
I've also tried to make template context variables more logical and consistent throughout.
2013-05-26 01:55:43 +01:00
Daniel Greenfeld
a94416d99e
Merge pull request #149 from AndrewIngram/l18n
...
Template internationalization
2013-05-25 14:26:00 -07:00
Andrew Ingram
a4d77a9309
Template internationalization
2013-05-25 18:44:48 +01:00
Ben Tappin
c79f53bb02
Add tests for admin2 templatetags and fix bug.
2013-05-25 16:45:26 +01:00
Daniel Greenfeld
906b8cbf4e
Adding endline to bump things forward
2013-05-24 20:48:43 +02:00
Daniel Greenfeld
99204be715
Added tests for djadmin.utils
2013-05-24 16:22:54 +02:00
Ben Tappin
30cacb7569
Use PK instead of ID in the model list view and template.
2013-05-24 12:06:35 +01:00
Daniel Greenfeld
0236a5cc07
small correction on model naming
2013-05-23 22:34:15 +02:00
Daniel Greenfeld
a3eea0aaf9
Merge branch 'bugfix/delete-action-message-display' of git://github.com/chrislawlor/django-admin2 into chrislawlor-bugfix/delete-action-message-display
2013-05-23 22:30:24 +02:00
Daniel Greenfeld
dca4d849d7
Merge branch 'floppify-auth-forms' of git://github.com/gregmuellegger/django-admin2 into gregmuellegger-floppify-auth-forms
2013-05-23 22:25:16 +02:00
Chris Lawlor
396f49665e
Fixes message display after action handling.
...
Calls unicode to force encoding of object name to a localized
unicode string. Also fixes deleted object count by saving
len(queryset) to a local var before calling queryset.delete(), as
the len after queryset.delete() is always zero.
2013-05-23 15:37:50 -04:00
Gregor Müllegger
d10838c2ed
Don't copy input_type attribute from original widget when the floppyform widget has a much more appropriate HTML5 type.
2013-05-23 20:59:35 +02:00
Daniel Greenfeld
5f1f91167f
test cleanup
2013-05-23 20:22:44 +02:00
Daniel Greenfeld
0092325262
Used filters to present results of views better for #128
2013-05-23 20:11:04 +02:00
Daniel Greenfeld
611b34fd64
Wrapped all calls to model._meta with model_options function. fix #134
2013-05-23 20:00:14 +02:00
Daniel Greenfeld
d8409a2070
For #134 , this moves many independant functions to the utils module and begins conversion of naked ._meta use to using the utils.model_options wrapper
2013-05-23 19:46:03 +02:00
Daniel Greenfeld
638ae91756
PEP-8 work
2013-05-23 19:30:15 +02:00
Daniel Greenfeld
5129541154
merge and adding requirements for floppy-forms
2013-05-23 19:23:23 +02:00
Daniel Greenfeld
a62d3aceff
merge conflict resolutions
2013-05-23 13:01:27 +02:00
Gregor Müllegger
77fa844184
Also take form field into account when floppifying widgets. That way all specific floppyform widgets will be used for modelforms (like EmailInput, NumberInput, etc.).
2013-05-22 22:16:03 +02:00
Gregor Müllegger
984b6fb8d4
Using own modelform_factory to produce forms that are using floppyforms widgets. That allows better customization in the frontend.
2013-05-22 19:29:51 +02:00
Gregor Müllegger
188c12d647
Implementing a modelform_factory that takes care of converting all widgets on the modelform to floppyform widgets if possible.
2013-05-22 19:29:12 +02:00
Daniel Greenfeld
af96990275
Move mixins to their own directory so the apiviews aren't directly importing from views
2013-05-22 18:40:53 +02:00
Daniel Greenfeld
cd82aad51b
Merge pull request #132 from audreyr/cruft-cleanup
...
Remove unused Admin2Form class.
2013-05-22 09:01:10 -07:00
Peter Inglesby
ade92956d0
Handle actions by POSTing to ModelListView
2013-05-22 11:32:01 +01:00
Peter Inglesby
79e6dfad83
Add delete_selected action
2013-05-22 11:32:01 +01:00
Peter Inglesby
8b6b56a1a8
Add messages to base.html
2013-05-22 11:32:01 +01:00
Peter Inglesby
88c0ce4e9f
Remove stray closing tag.
2013-05-22 11:32:01 +01:00
Audrey Roy
0d6ab93b84
Remove unused Admin2Form class.
2013-05-22 10:38:23 +02:00
Andrew Ingram
a1ce27d4c2
Improve the rendering of inline form sets
2013-05-22 01:06:25 +01:00
Andrew Ingram
05f69775b2
Merge remote-tracking branch 'origin/develop' into inline-formsets
...
Conflicts:
djadmin2/templates/admin2/bootstrap/model_add_form.html
djadmin2/templates/admin2/bootstrap/model_edit_form.html
djadmin2/views.py
2013-05-22 00:58:53 +01:00
Audrey Roy
b79523c659
Refactor duplicate model add/edit forms.
2013-05-21 15:45:08 -07:00
Daniel Greenfeld
5836a1cb97
Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into develop
2013-05-22 00:38:24 +02:00
Daniel Greenfeld
192229e513
Fix admin2_tags templatetag reference that was bad
2013-05-22 00:37:14 +02:00
Audrey Roy
16ceca0dfe
Model edit form now reuses save logic
2013-05-21 23:50:50 +02:00
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
