Bladeren bron

[catalog] Fix databases page

Romain Rigaux 12 jaren geleden
bovenliggende
commit
b54c0cd

+ 1 - 6
apps/catalog/src/catalog/templates/components.mako

@@ -19,12 +19,9 @@
 %>
 
 <%def name="breadcrumbs(breadcrumbs)">
-
-
-
   <ul class="nav nav-pills hueBreadcrumbBar" id="breadcrumbs">
     <li>
-      <a href="${url('catalog:index')}"><i class="icon-sitemap"></i> ${_('Databases')}</a>
+      <a href="${url('catalog:databases')}"><i class="icon-sitemap"></i> ${_('Databases')}</a>
     </li>
     <li>
       <ul class="hueBreadcrumb">
@@ -39,8 +36,6 @@
       </ul>
     </li>
   </ul>
-
-
 </%def>
 
 <%def name="bootstrapLabel(field)">

+ 2 - 2
apps/catalog/src/catalog/templates/databases.mako

@@ -16,7 +16,6 @@
 <%!
 from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
-import json
 %>
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="components" file="components.mako" />
@@ -26,6 +25,7 @@ ${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
 <div class="container-fluid" id="databases">
     <h1>${_('Databases')}</h1>
     ${ components.breadcrumbs(breadcrumbs) }
+
     <div class="row-fluid">
         <div class="span3">
             <div class="well sidebar-nav">
@@ -91,7 +91,7 @@ ${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
     var viewModel = {
-        availableDatabases : ko.observableArray(${ json.dumps(databases) | n }),
+        availableDatabases : ko.observableArray(${ databases_json | n,unicode }),
         chosenDatabases : ko.observableArray([])
     };
 

+ 1 - 1
apps/catalog/src/catalog/urls.py

@@ -20,7 +20,7 @@ from django.conf.urls.defaults import patterns, url
 urlpatterns = patterns('catalog.views',
   url(r'^$', 'index', name='index'),
 
-  url(r'^databases/?$', 'show_databases', name='show_databases'),
+  url(r'^databases/?$', 'databases', name='databases'),
   url(r'^databases/drop/?$', 'drop_database', name='drop_database'),
 
   url(r'^tables/(?P<database>\w+)?$', 'show_tables', name='show_tables'),

+ 3 - 1
apps/catalog/src/catalog/views.py

@@ -46,12 +46,14 @@ def index(request):
 Database Views
 """
 
-def show_databases(request):
+def databases(request):
   db = dbms.get(request.user)
   databases = db.get_databases()
+
   return render("databases.mako", request, {
     'breadcrumbs': [],
     'databases': databases,
+    'databases_json': json.dumps(databases),
   })