Documentation fixes

c30802d5 · Serge S. Koval · f1576a6b · c30802d5 · c30802d5 · c30802d5
Commit c30802d5 authored Aug 27, 2012 by Serge S. Koval
Showing with 9 additions and 2 deletions

changelog.rst doc/changelog.rst +1 -1

form.html examples/auth/templates/form.html +2 -1

simple.py examples/peewee/simple.py +5 -0

__init__.py flask_admin/__init__.py +1 -0

No files found.
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,7 +6,7 @@ Changelog
 * Peewee model backend
 * Inline form administration interface for models a-la Django
-* Model actions - methods that work with more than one model (for example - mass delete)
+* Mass actions - methods that work with more than one item (for example - mass delete for models or files)
 * SQLAlchemy form scaffolding is now independent from the wtforms.ext.sqlalchemy helpers
 * Added ability to mount administrative interface as a top-level folder
 * Administrative interface can now be mounted as a subdomain

--- a/examples/auth/templates/form.html
+++ b/examples/auth/templates/form.html
@@ -2,7 +2,8 @@
    <body>
        <form method="POST" action="">
            {{ form.hidden_tag() }}
-            {% for f in form if f.label.text != 'Csrf' %}
+            {% for f in form if f.type != 'CSRFTokenField' %}
+            {{ f.type }}
            <div>
            {{ f.label }}
            {{ f }}

--- a/examples/peewee/simple.py
+++ b/examples/peewee/simple.py
@@ -67,6 +67,11 @@ class PostAdmin(peeweemodel.ModelView):
                      'date',
                      User.username)
+    @admin.action('merge',
+            'Merge',
+            'Are you sure you want to merge selected models?')
+    def action_combine(self, ids):
+        pass
 @app.route('/')
 def index():

--- a/flask_admin/__init__.py
+++ b/flask_admin/__init__.py
 from .base import expose, Admin, BaseView, AdminIndexView
+from .actions import action