Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
flask-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
flask-admin
Commits
669de15c
Commit
669de15c
authored
Sep 07, 2013
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #307 from ant1441/logger-name
Name all loggers.
parents
63f801fc
f9deee79
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
13 deletions
+30
-13
view.py
flask_admin/contrib/mongoengine/view.py
+7
-3
view.py
flask_admin/contrib/peewee/view.py
+6
-3
view.py
flask_admin/contrib/pymongo/view.py
+6
-3
rediscli.py
flask_admin/contrib/rediscli.py
+4
-1
view.py
flask_admin/contrib/sqla/view.py
+7
-3
No files found.
flask_admin/contrib/mongoengine/view.py
View file @
669de15c
...
@@ -22,6 +22,10 @@ from .ajax import process_ajax_references, create_ajax_loader
...
@@ -22,6 +22,10 @@ from .ajax import process_ajax_references, create_ajax_loader
from
.subdoc
import
convert_subdocuments
from
.subdoc
import
convert_subdocuments
# Set up logger
log
=
logging
.
getLogger
(
"flask-admin.mongo"
)
SORTABLE_FIELDS
=
set
((
SORTABLE_FIELDS
=
set
((
mongoengine
.
StringField
,
mongoengine
.
StringField
,
mongoengine
.
IntField
,
mongoengine
.
IntField
,
...
@@ -478,7 +482,7 @@ class ModelView(BaseModelView):
...
@@ -478,7 +482,7 @@ class ModelView(BaseModelView):
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
format_error
(
ex
)),
error
=
format_error
(
ex
)),
'error'
)
'error'
)
log
ging
.
exception
(
'Failed to create model'
)
log
.
exception
(
'Failed to create model'
)
return
False
return
False
else
:
else
:
self
.
after_model_change
(
form
,
model
,
True
)
self
.
after_model_change
(
form
,
model
,
True
)
...
@@ -505,7 +509,7 @@ class ModelView(BaseModelView):
...
@@ -505,7 +509,7 @@ class ModelView(BaseModelView):
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
format_error
(
ex
)),
error
=
format_error
(
ex
)),
'error'
)
'error'
)
log
ging
.
exception
(
'Failed to update model'
)
log
.
exception
(
'Failed to update model'
)
return
False
return
False
else
:
else
:
self
.
after_model_change
(
form
,
model
,
False
)
self
.
after_model_change
(
form
,
model
,
False
)
...
@@ -530,7 +534,7 @@ class ModelView(BaseModelView):
...
@@ -530,7 +534,7 @@ class ModelView(BaseModelView):
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
format_error
(
ex
)),
error
=
format_error
(
ex
)),
'error'
)
'error'
)
log
ging
.
exception
(
'Failed to delete model'
)
log
.
exception
(
'Failed to delete model'
)
return
False
return
False
# FileField access API
# FileField access API
...
...
flask_admin/contrib/peewee/view.py
View file @
669de15c
...
@@ -15,6 +15,9 @@ from .form import get_form, CustomModelConverter, InlineModelConverter, save_inl
...
@@ -15,6 +15,9 @@ from .form import get_form, CustomModelConverter, InlineModelConverter, save_inl
from
.tools
import
get_primary_key
,
parse_like_term
from
.tools
import
get_primary_key
,
parse_like_term
from
.ajax
import
create_ajax_loader
from
.ajax
import
create_ajax_loader
# Set up logger
log
=
logging
.
getLogger
(
"flask-admin.peewee"
)
class
ModelView
(
BaseModelView
):
class
ModelView
(
BaseModelView
):
column_filters
=
None
column_filters
=
None
...
@@ -350,7 +353,7 @@ class ModelView(BaseModelView):
...
@@ -350,7 +353,7 @@ class ModelView(BaseModelView):
raise
raise
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
log
ging
.
exception
(
'Failed to create model'
)
log
.
exception
(
'Failed to create model'
)
return
False
return
False
else
:
else
:
self
.
after_model_change
(
form
,
model
,
True
)
self
.
after_model_change
(
form
,
model
,
True
)
...
@@ -370,7 +373,7 @@ class ModelView(BaseModelView):
...
@@ -370,7 +373,7 @@ class ModelView(BaseModelView):
raise
raise
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
log
ging
.
exception
(
'Failed to update model'
)
log
.
exception
(
'Failed to update model'
)
return
False
return
False
else
:
else
:
self
.
after_model_change
(
form
,
model
,
False
)
self
.
after_model_change
(
form
,
model
,
False
)
...
@@ -387,7 +390,7 @@ class ModelView(BaseModelView):
...
@@ -387,7 +390,7 @@ class ModelView(BaseModelView):
raise
raise
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
log
ging
.
exception
(
'Failed to delete model'
)
log
.
exception
(
'Failed to delete model'
)
return
False
return
False
# Default model actions
# Default model actions
...
...
flask_admin/contrib/pymongo/view.py
View file @
669de15c
...
@@ -15,6 +15,9 @@ from flask.ext.admin.helpers import get_form_data
...
@@ -15,6 +15,9 @@ from flask.ext.admin.helpers import get_form_data
from
.filters
import
BasePyMongoFilter
from
.filters
import
BasePyMongoFilter
from
.tools
import
parse_like_term
from
.tools
import
parse_like_term
# Set up logger
log
=
logging
.
getLogger
(
"flask-admin.pymongo"
)
class
ModelView
(
BaseModelView
):
class
ModelView
(
BaseModelView
):
"""
"""
...
@@ -260,7 +263,7 @@ class ModelView(BaseModelView):
...
@@ -260,7 +263,7 @@ class ModelView(BaseModelView):
except
Exception
as
ex
:
except
Exception
as
ex
:
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
str
(
ex
)),
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
'error'
)
log
ging
.
exception
(
'Failed to create model'
)
log
.
exception
(
'Failed to create model'
)
return
False
return
False
else
:
else
:
self
.
after_model_change
(
form
,
model
,
True
)
self
.
after_model_change
(
form
,
model
,
True
)
...
@@ -285,7 +288,7 @@ class ModelView(BaseModelView):
...
@@ -285,7 +288,7 @@ class ModelView(BaseModelView):
except
Exception
as
ex
:
except
Exception
as
ex
:
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
str
(
ex
)),
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
'error'
)
log
ging
.
exception
(
'Failed to update model'
)
log
.
exception
(
'Failed to update model'
)
return
False
return
False
else
:
else
:
self
.
after_model_change
(
form
,
model
,
False
)
self
.
after_model_change
(
form
,
model
,
False
)
...
@@ -311,7 +314,7 @@ class ModelView(BaseModelView):
...
@@ -311,7 +314,7 @@ class ModelView(BaseModelView):
except
Exception
as
ex
:
except
Exception
as
ex
:
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
str
(
ex
)),
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
'error'
)
log
ging
.
exception
(
'Failed to delete model'
)
log
.
exception
(
'Failed to delete model'
)
return
False
return
False
# Default model actions
# Default model actions
...
...
flask_admin/contrib/rediscli.py
View file @
669de15c
...
@@ -10,6 +10,9 @@ from flask.ext.admin.base import BaseView, expose
...
@@ -10,6 +10,9 @@ from flask.ext.admin.base import BaseView, expose
from
flask.ext.admin.babel
import
gettext
from
flask.ext.admin.babel
import
gettext
from
flask.ext.admin._compat
import
VER
from
flask.ext.admin._compat
import
VER
# Set up logger
log
=
logging
.
getLogger
(
"flask-admin.redis"
)
class
CommandError
(
Exception
):
class
CommandError
(
Exception
):
"""
"""
...
@@ -203,5 +206,5 @@ class RedisCli(BaseView):
...
@@ -203,5 +206,5 @@ class RedisCli(BaseView):
except
CommandError
as
err
:
except
CommandError
as
err
:
return
self
.
_error
(
'Cli:
%
s'
%
err
)
return
self
.
_error
(
'Cli:
%
s'
%
err
)
except
Exception
as
ex
:
except
Exception
as
ex
:
log
ging
.
exception
(
ex
)
log
.
exception
(
ex
)
return
self
.
_error
(
'Cli:
%
s'
%
ex
)
return
self
.
_error
(
'Cli:
%
s'
%
ex
)
flask_admin/contrib/sqla/view.py
View file @
669de15c
...
@@ -19,6 +19,10 @@ from .tools import is_inherited_primary_key, get_column_for_current_model, get_q
...
@@ -19,6 +19,10 @@ from .tools import is_inherited_primary_key, get_column_for_current_model, get_q
from
.ajax
import
create_ajax_loader
from
.ajax
import
create_ajax_loader
# Set up logger
log
=
logging
.
getLogger
(
"flask-admin.sqla"
)
class
ModelView
(
BaseModelView
):
class
ModelView
(
BaseModelView
):
"""
"""
SQLAlchemy model view
SQLAlchemy model view
...
@@ -792,7 +796,7 @@ class ModelView(BaseModelView):
...
@@ -792,7 +796,7 @@ class ModelView(BaseModelView):
raise
raise
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
flash
(
gettext
(
'Failed to create model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
log
ging
.
exception
(
'Failed to create model'
)
log
.
exception
(
'Failed to create model'
)
self
.
session
.
rollback
()
self
.
session
.
rollback
()
return
False
return
False
else
:
else
:
...
@@ -818,7 +822,7 @@ class ModelView(BaseModelView):
...
@@ -818,7 +822,7 @@ class ModelView(BaseModelView):
raise
raise
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
flash
(
gettext
(
'Failed to update model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
log
ging
.
exception
(
'Failed to update model'
)
log
.
exception
(
'Failed to update model'
)
self
.
session
.
rollback
()
self
.
session
.
rollback
()
return
False
return
False
...
@@ -845,7 +849,7 @@ class ModelView(BaseModelView):
...
@@ -845,7 +849,7 @@ class ModelView(BaseModelView):
raise
raise
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
flash
(
gettext
(
'Failed to delete model.
%(error)
s'
,
error
=
str
(
ex
)),
'error'
)
log
ging
.
exception
(
'Failed to delete model'
)
log
.
exception
(
'Failed to delete model'
)
self
.
session
.
rollback
()
self
.
session
.
rollback
()
return
False
return
False
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment