Merge pull request #753 from globocom/dev

Dev

Author: nimbfire

dbaas/admin/static/admin/css/datatables.css

@@ -14,6 +14,7 @@
 <link rel="stylesheet" type="text/css" href="{% static "admin/css/bootstrap.min.css" %}" />
 <link rel="stylesheet" type="text/css" href="{% static "admin/css/bootstrap-responsive.min.css" %}" />
 <link rel="stylesheet" type="text/css" href="{% static "admin/css/notification.css" %}" />
+<link rel="stylesheet" type="text/css" href="{% static "admin/css/datatables.min.css" %}" />
 
 <!-- Font Awesome -->
 <link rel="stylesheet" href="{% static "assets/css/font-awesome.min.css" %}">
@@ -192,6 +193,7 @@
 {% endblock js_footer_commons %}
 <script type="text/javascript" src="{% static 'admin/js/mustache2.js' %}"></script>
 <script type="text/javascript" src="{% static 'admin/js/notification.js' %}"></script>
+<script type="text/javascript" src="{% static 'admin/js/datatables.min.js' %}"></script>
 
 <script type="text/javascript">
     Base.init(

dbaas/admin/static/admin/css/datatables.min.css

@@ -14,6 +14,8 @@
     {% if config_docs_url %}
       <a href="{{ config_docs_url }}" target="_blank" class="brand" id="site-docs">Docs</a>
     {% endif %}
+      <a href="http://dbmonitor.globoi.com" target="_blank" class="brand" id="site-db-monitor">DBMonitor</a>
+
 {% endblock %}
 
 {% block nav-global %}{% endblock %}

dbaas/admin/static/admin/js/datatables.js

@@ -75,9 +75,9 @@ <h2>{% trans 'My Actions' %}</h2>
         <div class="span12 app-list">
         {% endif %}
             {% if app_list %}
-                <h2>{% trans 'Apps' %}</h2>
+                <h2 id="apps-list-title">{% trans 'Apps' %}</h2>
                 {% for app in app_list %}
-                    <table summary="{% blocktrans with name=app.name %}Models available in the {{ name }} application.{% endblocktrans %}" class="table table-striped table-hover table-bordered table-condensed">
+                    <table summary="{% blocktrans with name=app.name %}Models available in the {{ name }} application.{% endblocktrans %}" class="table table-striped table-hover table-bordered table-condensed" id="app-{{ app.app_label }}">
                         <thead>
                           <tr>
                             <th colspan="4">
@@ -161,8 +161,18 @@ <h3>
             }
         }
 
+        reorder_apps = function(){
+            first_app = 'logical';
+            app = $(`#app-${first_app}`);
+            app.clone().insertAfter('#apps-list-title')
+            app.remove();
+        }
+
         $(window).resize(swap_if_necessary);
-        $(document).ready(swap_if_necessary);
+        $(document).ready(function() {
+            reorder_apps();
+            swap_if_necessary();
+        });
     })(django.jQuery);
     </script>
 {% endblock js_footer %}

dbaas/admin/static/admin/js/datatables.min.js

@@ -678,6 +678,7 @@ def get_cluster_client(self, instance, default_timeout=False):
                 {'host': instance.address, 'port': instance.port}
                 for instance in self.instances_filtered
             ],
+            max_connections=None,
             password=self.databaseinfra.password,
             socket_timeout=REDIS_CONNECTION_DEFAULT_TIMEOUT if default_timeout else self.connection_timeout_in_seconds,
             socket_connect_timeout=REDIS_CONNECTION_SOCKET_TIMEOUT if default_timeout else self.connection_socket_timeout_in_seconds,

dbaas/admin/templates/admin/base.html

@@ -97,6 +97,9 @@ class DatabaseHistory(models.Model):
     description = models.TextField(
         verbose_name=_("Description"), null=True, blank=True
     )
+    apps_bind_name = models.TextField(
+        verbose_name=_("apps_bind_name"), null=True, blank=True
+    )
 
 
 class Database(BaseModel):