Save dashboard columns when choosing columns

John-Magne Bredal · John-Magne Bredal · commit c7cebd9210d0 · 2016-09-07T17:09:18.000+02:00
diff --git a/htdocs/static/js/src/webfront.js b/htdocs/static/js/src/webfront.js
@@ -111,8 +111,11 @@ require([
 
         $('.column-chooser').click(function() {
             $navletsContainer.empty();
-            new NavletsController($navletsContainer, $(this).data('columns'));
+            var columns = $(this).data('columns');
+            new NavletsController($navletsContainer, columns);
             // Save number of columns
+            var url = $(this).closest('.button-group').data('url');
+            var request = $.post(url, {num_columns: columns});
         });
 
 
diff --git a/python/nav/models/profiles.py b/python/nav/models/profiles.py
@@ -1368,6 +1368,7 @@ class AccountDashboard(models.Model):
     """Stores dashboards for each user"""
     name = VarcharField()
     is_default = models.BooleanField(default=False)
+    num_columns = models.IntegerField(default=3)
     account = models.ForeignKey(Account)
 
     def __unicode__(self):
diff --git a/python/nav/web/navlets/__init__.py b/python/nav/web/navlets/__init__.py
@@ -73,7 +73,7 @@
 from nav.models.manage import Sensor
 from nav.django.auth import get_sudoer
 from nav.django.utils import get_account
-from nav.web.webfront import get_widget_columns
+from nav.web.webfront import get_widget_columns, find_dashboard
 
 _logger = logging.getLogger(__name__)
 
@@ -192,11 +192,8 @@ def get_navlet_from_name(navletmodule):
 
 def get_user_navlets(request, dashboard_id=None):
     """Gets all navlets that this user subscribes to for a given dashboard"""
-    account = request.account
-    kwargs = {'pk': dashboard_id} if dashboard_id else {'is_default': True}
-    dash = AccountDashboard.objects.get(account=account, **kwargs)
-
-    usernavlets = dash.widgets.all()
+    dashboard = find_dashboard(request.account, dashboard_id)
+    usernavlets = dashboard.widgets.all()
 
     navlets = []
     for usernavlet in usernavlets:
@@ -256,12 +253,11 @@ def add_user_navlet(request, dashboard_id=None):
     """Add a navlet subscription to this user"""
     if request.method == 'POST' and 'navlet' in request.POST:
         account = request.account
-        kwargs = {'pk': dashboard_id} if dashboard_id else {'is_default': True}
-        dash = AccountDashboard.objects.get(account=account, **kwargs)
+        dashboard = find_dashboard(account, dashboard_id=dashboard_id)
 
         if can_modify_navlet(account, request):
             navlet_class = request.POST.get('navlet')
-            navlet = add_navlet(account, navlet_class, dashboard=dash)
+            navlet = add_navlet(account, navlet_class, dashboard=dashboard)
             return HttpResponse(json.dumps(create_navlet_object(navlet)),
                                 content_type="application/json")
 
diff --git a/python/nav/web/webfront/__init__.py b/python/nav/web/webfront/__init__.py
@@ -1,8 +1,30 @@
 """NAV web common package."""
 
+from django.db.models import Count
+
+from nav.models.profiles import AccountDashboard
+
 DEFAULT_WIDGET_COLUMNS = 2
 
+
 def get_widget_columns(account):
     """Get the preference for widget columns"""
     return int(account.preferences.get(account.PREFERENCE_KEY_WIDGET_COLUMNS,
                                        DEFAULT_WIDGET_COLUMNS))
+
+
+def find_dashboard(account, dashboard_id=None):
+    """Find a dashboard for this account
+
+    Either find a specific one or the default one. If none of those exist we
+    find the one with the most widgets.
+    """
+    kwargs = {'pk': dashboard_id} if dashboard_id else {'is_default': True}
+    try:
+        dashboard = AccountDashboard.objects.get(account=account, **kwargs)
+    except AccountDashboard.DoesNotExist:
+        # No default dashboard? Find the one with the most widgets
+        dashboard = AccountDashboard.objects.filter(account=account).annotate(
+                Count('widgets')).order_by('-widgets__count')[0]
+
+    return dashboard
diff --git a/python/nav/web/webfront/urls.py b/python/nav/web/webfront/urls.py
@@ -31,6 +31,8 @@
         name='rename-dashboard'),
     url(r'^index/dashboard/delete/(?P<did>\d+)/$', 'delete_dashboard',
         name='delete-dashboard'),
+    url(r'^index/dashboard/columns/(?P<did>\d+)/$', 'save_dashboard_columns',
+        name='save-dashboard-columns'),
 
     url(r'^about/', 'about', name='webfront-about'),
     url(r'^toolbox/$', 'toolbox', name='webfront-toolbox'),
diff --git a/python/nav/web/webfront/views.py b/python/nav/web/webfront/views.py
@@ -21,7 +21,6 @@
 import logging
 from operator import attrgetter
 
-from django.db.models import Count
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponse, JsonResponse
 from django.views.decorators.http import require_POST
@@ -40,7 +39,7 @@
                                     DashboardForm)
 from nav.web.navlets import list_navlets
 from nav.web.message import new_message, Messages
-from nav.web.webfront import get_widget_columns
+from nav.web.webfront import get_widget_columns, find_dashboard
 
 _logger = logging.getLogger('nav.web.tools')
 
@@ -362,18 +361,13 @@ def rename_dashboard(request, did):
         'Dashboard renamed to &laquo;{}&raquo;'.format(dash.name))
 
 
-def find_dashboard(account, dashboard_id=None):
-    """Find a dashboard for this account
-
-    Either find a specific one or the default one. If none of those exist we
-    find the one with the most widgets.
-    """
-    kwargs = {'pk': dashboard_id} if dashboard_id else {'is_default': True}
-    try:
-        dashboard = AccountDashboard.objects.get(account=account, **kwargs)
-    except AccountDashboard.DoesNotExist:
-        # No default dashboard? Find the one with the most widgets
-        dashboard = AccountDashboard.objects.filter(account=account).annotate(
-                Count('widgets')).order_by('-widgets__count')[0]
+@require_POST
+def save_dashboard_columns(request, did):
+    """Save the number of columns for this dashboard"""
 
-    return dashboard
+    # Explicit fetch on account to prevent other people to change settings
+    dashboard = get_object_or_404(AccountDashboard, pk=did,
+                                  account=request.account)
+    dashboard.num_columns = request.POST.get('num_columns', 3)
+    dashboard.save()
+    return HttpResponse()
diff --git a/sql/changes/sc.04.06.0051.sql b/sql/changes/sc.04.06.0051.sql
@@ -3,6 +3,7 @@ CREATE TABLE profiles.account_dashboard (
   id SERIAL PRIMARY KEY,
   name VARCHAR DEFAULT 'My dashboard',
   is_default BOOLEAN DEFAULT FALSE,
+  num_columns INT,
   account_id INT REFERENCES account(id) ON UPDATE CASCADE ON DELETE CASCADE
 );
 
@@ -20,8 +21,8 @@ BEGIN
   FOR thisaccount IN SELECT * FROM account LOOP
     RAISE NOTICE 'Creating dashboard for %s', quote_ident(thisaccount.login);
     WITH inserted AS (
-      INSERT INTO account_dashboard (account_id, is_default)
-      VALUES (thisaccount.id, TRUE) RETURNING id
+      INSERT INTO account_dashboard (account_id, is_default, num_columns)
+      VALUES (thisaccount.id, TRUE, 3) RETURNING id
     )
     UPDATE account_navlet
       SET dashboard_id=inserted.id
diff --git a/templates/webfront/index.html b/templates/webfront/index.html
@@ -110,7 +110,7 @@ <h5>{{ navlet.title }}</h5>
         </div>
 
         <h5>Columns</h5>
-        <ul class="button-group" style="margin-bottom: 1em;">
+        <ul class="button-group" style="margin-bottom: 1em;" data-url="{% url 'save-dashboard-columns' dashboard.pk %}">
           <li><a href="#" class="button tiny secondary column-chooser" data-columns="2">Two</a></li>
           <li><a href="#" class="button tiny secondary column-chooser" data-columns="3">Three</a></li>
           <li><a href="#" class="button tiny secondary column-chooser" data-columns="4">Four</a></li>
@@ -157,7 +157,7 @@ <h5>Columns</h5>
        data-remove-navlet="{% url 'remove-user-navlet' %}"
        data-save-order-url="{% url 'save-navlet-order' %}"
        data-base-template-url="{% url 'navlet-base-template' %}"
-       data-widget-columns="{{ widget_columns }}"
+       data-widget-columns="{{ dashboard.num_columns }}"
   ></div>
 
   <ul id="joyride_for_desktop" data-joyride class="joyride-list">
