Merge pull request #70 from techniq/master

Use url/endpoint from passed in index_view if present

flask_admin/base.py

@@ -239,13 +239,10 @@ class AdminIndexView(BaseView):
         * Automatically associates with static folder.
     """
     def __init__(self, name=None, category=None, endpoint=None, url=None):
-        if url is None:
-            url = '/admin'
-
         super(AdminIndexView, self).__init__(name or babel.lazy_gettext('Home'),
                                              category,
                                              endpoint or 'admin',
-                                             url,
+                                             url or '/admin',
                                              'static')
 
     @expose()
@@ -342,12 +339,13 @@ class Admin(object):
             name = 'Admin'
         self.name = name
 
-        if url is None:
-            url = '/admin'
-        self.url = url
+        self.index_view = index_view or AdminIndexView(endpoint=endpoint, url=url)
+        self.endpoint = endpoint or self.index_view.endpoint
+        self.url = url or self.index_view.url
         self.subdomain = subdomain
 
-        self.endpoint = endpoint
+        # Add predefined index view
+        self.add_view(self.index_view)
 
         # Localizations
         self.locale_selector_func = None
@@ -356,15 +354,6 @@ class Admin(object):
         if app:
             self._init_extension()
 
-        # Index view
-        if index_view is None:
-            index_view = AdminIndexView(endpoint=self.endpoint, url=self.url)
-
-        self.index_view = index_view
-
-        # Add predefined index view
-        self.add_view(index_view)
-
     def add_view(self, view):
         """
             Add view to the collection.

flask_admin/tests/test_base.py

@@ -196,6 +196,15 @@ def test_delayed_init():
     eq_(rv.data, 'Success!')
 
 
+def test_multi_instances_init():
+    app = Flask(__name__)
+    admin = base.Admin(app)
+
+    class ManageIndex(base.AdminIndexView):
+        pass
+    manage = base.Admin(app, index_view=ManageIndex(url='/manage', endpoint='manage'))
+
+
 @raises(Exception)
 def test_double_init():
     app = Flask(__name__)