Merge branch 'master' of github.com:mrjoes/flask-admin

babel/admin.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Flask-Admin VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-08-19 10:04+0300\n"
+"POT-Creation-Date: 2012-11-02 11:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,159 +18,189 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: ../flask_admin/base.py:217
+#: ../flask_admin/base.py:283
 msgid "Home"
 msgstr ""
 
-#: ../flask_admin/form.py:81
+#: ../flask_admin/form.py:83
 msgid "Invalid time format"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:32
+#: ../flask_admin/contrib/fileadmin.py:33
 msgid "Invalid directory name"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:40
+#: ../flask_admin/contrib/fileadmin.py:41
 msgid "File to upload"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:49
+#: ../flask_admin/contrib/fileadmin.py:50
 msgid "File required."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:54
+#: ../flask_admin/contrib/fileadmin.py:55
 msgid "Invalid file type."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:338
+#: ../flask_admin/contrib/fileadmin.py:365
 msgid "File uploading is disabled."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:347
+#: ../flask_admin/contrib/fileadmin.py:374
 #, python-format
 msgid "File \"%(name)s\" already exists."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:354
+#: ../flask_admin/contrib/fileadmin.py:381
 #, python-format
 msgid "Failed to save file: %(error)s"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:373
+#: ../flask_admin/contrib/fileadmin.py:400
 msgid "Directory creation is disabled."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:383
+#: ../flask_admin/contrib/fileadmin.py:410
 #, python-format
 msgid "Failed to create directory: %(error)s"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:405
+#: ../flask_admin/contrib/fileadmin.py:432
 msgid "Deletion is disabled."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:410
+#: ../flask_admin/contrib/fileadmin.py:437
 msgid "Directory deletion is disabled."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:415
+#: ../flask_admin/contrib/fileadmin.py:442
 #, python-format
 msgid "Directory \"%s\" was successfully deleted."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:417
+#: ../flask_admin/contrib/fileadmin.py:444
 #, python-format
 msgid "Failed to delete directory: %(error)s"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:421
+#: ../flask_admin/contrib/fileadmin.py:448
+#: ../flask_admin/contrib/fileadmin.py:511
 #, python-format
 msgid "File \"%(name)s\" was successfully deleted."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:423
+#: ../flask_admin/contrib/fileadmin.py:450
+#: ../flask_admin/contrib/fileadmin.py:513
 #, python-format
 msgid "Failed to delete file: %(name)s"
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:442
+#: ../flask_admin/contrib/fileadmin.py:469
 msgid "Renaming is disabled."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:446
+#: ../flask_admin/contrib/fileadmin.py:473
 msgid "Path does not exist."
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:457
+#: ../flask_admin/contrib/fileadmin.py:484
 #, python-format
 msgid "Successfully renamed \"%(src)s\" to \"%(dst)s\""
 msgstr ""
 
-#: ../flask_admin/contrib/fileadmin.py:460
+#: ../flask_admin/contrib/fileadmin.py:487
 #, python-format
 msgid "Failed to rename: %(error)s"
 msgstr ""
 
+#: ../flask_admin/contrib/fileadmin.py:503
+#: ../flask_admin/contrib/peeweemodel/view.py:355
+#: ../flask_admin/contrib/sqlamodel/view.py:680
+msgid "Delete"
+msgstr ""
+
+#: ../flask_admin/contrib/fileadmin.py:504
+msgid "Are you sure you want to delete these files?"
+msgstr ""
+
+#: ../flask_admin/contrib/peeweemodel/filters.py:35
 #: ../flask_admin/contrib/sqlamodel/filters.py:35
 msgid "equals"
 msgstr ""
 
+#: ../flask_admin/contrib/peeweemodel/filters.py:43
 #: ../flask_admin/contrib/sqlamodel/filters.py:43
 msgid "not equal"
 msgstr ""
 
+#: ../flask_admin/contrib/peeweemodel/filters.py:52
 #: ../flask_admin/contrib/sqlamodel/filters.py:52
 msgid "contains"
 msgstr ""
 
+#: ../flask_admin/contrib/peeweemodel/filters.py:61
 #: ../flask_admin/contrib/sqlamodel/filters.py:61
 msgid "not contains"
 msgstr ""
 
+#: ../flask_admin/contrib/peeweemodel/filters.py:69
 #: ../flask_admin/contrib/sqlamodel/filters.py:69
 msgid "greater than"
 msgstr ""
 
+#: ../flask_admin/contrib/peeweemodel/filters.py:77
 #: ../flask_admin/contrib/sqlamodel/filters.py:77
 msgid "smaller than"
 msgstr ""
 
-#: ../flask_admin/contrib/sqlamodel/form.py:37
-msgid "Already exists."
-msgstr ""
-
-#: ../flask_admin/contrib/sqlamodel/view.py:520
+#: ../flask_admin/contrib/peeweemodel/view.py:317
+#: ../flask_admin/contrib/sqlamodel/view.py:627
 #, python-format
 msgid "Failed to create model. %(error)s"
 msgstr ""
 
-#: ../flask_admin/contrib/sqlamodel/view.py:535
+#: ../flask_admin/contrib/peeweemodel/view.py:332
+#: ../flask_admin/contrib/sqlamodel/view.py:647
 #, python-format
 msgid "Failed to update model. %(error)s"
 msgstr ""
 
-#: ../flask_admin/contrib/sqlamodel/view.py:550
+#: ../flask_admin/contrib/peeweemodel/view.py:342
+#: ../flask_admin/contrib/sqlamodel/view.py:666
 #, python-format
 msgid "Failed to delete model. %(error)s"
 msgstr ""
 
-#: ../flask_admin/contrib/sqlamodel/view.py:561
-msgid "delete"
+#: ../flask_admin/contrib/peeweemodel/view.py:356
+#: ../flask_admin/contrib/sqlamodel/view.py:681
+msgid "Are you sure you want to delete selected models?"
 msgstr ""
 
-#: ../flask_admin/contrib/sqlamodel/view.py:573
+#: ../flask_admin/contrib/peeweemodel/view.py:372
+#: ../flask_admin/contrib/sqlamodel/view.py:699
 #, python-format
 msgid "Model was successfully deleted."
-msgid_plural "%(count)s models were sucessfully deleted."
+msgid_plural "%(count)s models were successfully deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../flask_admin/contrib/sqlamodel/view.py:578
+#: ../flask_admin/contrib/peeweemodel/view.py:377
+#: ../flask_admin/contrib/sqlamodel/view.py:704
 #, python-format
 msgid "Failed to delete models. %(error)s"
 msgstr ""
 
-#: ../flask_admin/model/base.py:784
+#: ../flask_admin/contrib/sqlamodel/fields.py:125
+#: ../flask_admin/contrib/sqlamodel/fields.py:175
+#: ../flask_admin/contrib/sqlamodel/fields.py:180
+msgid "Not a valid choice"
+msgstr ""
+
+#: ../flask_admin/contrib/sqlamodel/validators.py:33
+msgid "Already exists."
+msgstr ""
+
+#: ../flask_admin/model/base.py:869
 msgid "Model was successfully created."
 msgstr ""
 
@@ -182,84 +212,88 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../flask_admin/templates/admin/lib.html:108
+#: ../flask_admin/templates/admin/actions.html:3
+msgid "With selected"
+msgstr ""
+
+#: ../flask_admin/templates/admin/lib.html:117
 msgid "Submit"
 msgstr ""
 
-#: ../flask_admin/templates/admin/lib.html:113
+#: ../flask_admin/templates/admin/lib.html:122
 msgid "Cancel"
 msgstr ""
 
-#: ../flask_admin/templates/admin/file/list.html:7
+#: ../flask_admin/templates/admin/file/list.html:8
 msgid "Root"
 msgstr ""
 
-#: ../flask_admin/templates/admin/file/list.html:42
+#: ../flask_admin/templates/admin/file/list.html:55
 #, python-format
 msgid "Are you sure you want to delete \\'%(name)s\\' recursively?"
 msgstr ""
 
-#: ../flask_admin/templates/admin/file/list.html:50
+#: ../flask_admin/templates/admin/file/list.html:63
 #, python-format
 msgid "Are you sure you want to delete \\'%(name)s\\'?"
 msgstr ""
 
-#: ../flask_admin/templates/admin/file/list.html:75
+#: ../flask_admin/templates/admin/file/list.html:90
 msgid "Upload File"
 msgstr ""
 
-#: ../flask_admin/templates/admin/file/list.html:78
+#: ../flask_admin/templates/admin/file/list.html:95
 msgid "Create Directory"
 msgstr ""
 
+#: ../flask_admin/templates/admin/file/list.html:109
+msgid "Please select at least one file."
+msgstr ""
+
 #: ../flask_admin/templates/admin/file/rename.html:5
 #, python-format
 msgid "Please provide new name for %(name)s"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/create.html:11
-msgid "Save and Add"
-msgstr ""
-
-#: ../flask_admin/templates/admin/model/create.html:16
-#: ../flask_admin/templates/admin/model/list.html:12
+#: ../flask_admin/templates/admin/model/create.html:12
+#: ../flask_admin/templates/admin/model/list.html:13
 msgid "List"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/create.html:19
-#: ../flask_admin/templates/admin/model/list.html:16
+#: ../flask_admin/templates/admin/model/create.html:15
+#: ../flask_admin/templates/admin/model/list.html:17
 msgid "Create"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:23
-msgid "Add Filter"
+#: ../flask_admin/templates/admin/model/create.html:20
+msgid "Save and Add"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:38
-msgid "With selected"
+#: ../flask_admin/templates/admin/model/list.html:24
+msgid "Add Filter"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:59
+#: ../flask_admin/templates/admin/model/list.html:51
 msgid "Search"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:72
+#: ../flask_admin/templates/admin/model/list.html:64
 msgid "Apply"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:74
+#: ../flask_admin/templates/admin/model/list.html:66
 msgid "Reset Filters"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:82
+#: ../flask_admin/templates/admin/model/list.html:74
 msgid "Remove Filter"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:153
+#: ../flask_admin/templates/admin/model/list.html:149
 msgid "You sure you want to delete this item?"
 msgstr ""
 
-#: ../flask_admin/templates/admin/model/list.html:211
+#: ../flask_admin/templates/admin/model/list.html:173
 msgid "Please select at least one model."
 msgstr ""
 

flask_admin/base.py

@@ -244,7 +244,7 @@ class BaseView(object):
             This method will be executed before calling any view method.
 
             By default, it will check if admin class is accessible and if it is not - will
-            throw HTTP 403 error.
+            throw HTTP 404 error.
 
             :param name:
                 View function name
@@ -252,7 +252,7 @@ class BaseView(object):
                 View function arguments
         """
         if not self.is_accessible():
-            return abort(403)
+            return abort(404)
 
 
 class AdminIndexView(BaseView):

flask_admin/templates/admin/actions.html

 {% macro dropdown(actions, btn_class='dropdown-toggle') -%}
     <a class="{{ btn_class }}" data-toggle="dropdown" href="#">
-        {{ _gettext('With selected')}}<b class="caret"></b>
+        {{ _gettext('With selected') }}<b class="caret"></b>
     </a>
     <ul class="dropdown-menu">
         {% for p in actions %}

flask_admin/tests/test_base.py

@@ -178,7 +178,7 @@ def test_permissions():
     view.allow_access = False
 
     rv = client.get('/admin/mockview/')
-    eq_(rv.status_code, 403)
+    eq_(rv.status_code, 404)
 
 
 def test_submenu():