Skip to content

F
flask-admin
Unverified Commit 704519bf authored by Jason Grider's avatar Jason Grider Committed by GitHub
Browse files
Options

Merge branch 'master' into master

parents 6505d6b2 874d2b76
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
flask_admin/contrib/sqla/form.py
View file @ 704519bf
...@@ -154,7 +154,9 @@ class AdminModelConverter(ModelConverterBase): ...@@ -154,7 +154,9 @@ class AdminModelConverter(ModelConverterBase):
if len(prop.columns) > 1: if len(prop.columns) > 1:
columns = filter_foreign_columns(model.__table__, prop.columns) columns = filter_foreign_columns(model.__table__, prop.columns)
if len(columns) > 1: if len(columns) == 0:
return None
elif len(columns) > 1:
warnings.warn('Can not convert multiple-column properties (%s.%s)' % (model, prop.key)) warnings.warn('Can not convert multiple-column properties (%s.%s)' % (model, prop.key))
return None return None
......
flask_admin/contrib/sqla/view.py
View file @ 704519bf
...@@ -420,7 +420,9 @@ class ModelView(BaseModelView): ...@@ -420,7 +420,9 @@ class ModelView(BaseModelView):
if len(p.columns) > 1: if len(p.columns) > 1:
filtered = tools.filter_foreign_columns(self.model.__table__, p.columns) filtered = tools.filter_foreign_columns(self.model.__table__, p.columns)
if len(filtered) > 1: if len(filtered) == 0:
continue
elif len(filtered) > 1:
warnings.warn('Can not convert multiple-column properties (%s.%s)' % (self.model, p.key)) warnings.warn('Can not convert multiple-column properties (%s.%s)' % (self.model, p.key))
continue continue
......
flask_admin/templates/bootstrap2/admin/base.html
View file @ 704519bf
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</head> </head>
<body> <body>
{% block page_body %} {% block page_body %}
<div class="container"> <div class="container{%if config.get('FLASK_ADMIN_FLUID_LAYOUT', False) %}-fluid{% endif %}">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
{% block brand %} {% block brand %}
......
flask_admin/templates/bootstrap3/admin/base.html
View file @ 704519bf
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</head> </head>
<body> <body>
{% block page_body %} {% block page_body %}
<div class="container"> <div class="container{%if config.get('FLASK_ADMIN_FLUID_LAYOUT', False) %}-fluid{% endif %}">
<nav class="navbar navbar-default" role="navigation"> <nav class="navbar navbar-default" role="navigation">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment