David Jean Louis avatar David Jean Louis committed c971b7e

Added a dashboard_id field to DashboardPreferences to distinguish preferences among various dashboards (fixes #43)

Comments (0)

Files changed (7)

admin_tools/dashboard/forms.py

         return preferences
 
     class Meta:
-        fields = ('data',)
+        fields = ('data', 'dashboard_id',)
         model = DashboardPreferences

admin_tools/dashboard/migrations/0002_auto__add_field_dashboardpreferences_dashboard_id.py

+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'DashboardPreferences.dashboard_id'
+        db.add_column('admin_tools_dashboard_preferences', 'dashboard_id', self.gf('django.db.models.fields.CharField')(default='dashboard', max_length=100), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'DashboardPreferences.dashboard_id'
+        db.delete_column('admin_tools_dashboard_preferences', 'dashboard_id')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'dashboard.dashboardpreferences': {
+            'Meta': {'ordering': "('user',)", 'object_name': 'DashboardPreferences', 'db_table': "'admin_tools_dashboard_preferences'"},
+            'dashboard_id': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'data': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['dashboard']

admin_tools/dashboard/models.py

     """
     user = models.ForeignKey('auth.User')
     data = models.TextField()
+    dashboard_id = models.CharField(max_length=100)
 
     def __unicode__(self):
         return "%s dashboard preferences" % self.user.username

admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html

                 '{{ dashboard.get_id }}',
                 {{ dashboard.columns }},
                 {% autoescape off %}{{ dashboard_preferences }}{% endautoescape %},
-                '{% url admin-tools-dashboard-set-preferences %}'
+                '{% url admin-tools-dashboard-set-preferences dashboard.get_id %}'
             );
         });
     });

admin_tools/dashboard/templatetags/admin_tools_dashboard_tags.py

     dashboard._prepare_children()
 
     try:
-        preferences = DashboardPreferences.objects.get(user=context['request'].user).data
+        preferences = DashboardPreferences.objects.get(
+            user=context['request'].user,
+            dashboard_id=dashboard.get_id()
+        ).data
     except DashboardPreferences.DoesNotExist:
         preferences = '{}'
-        DashboardPreferences(user=context['request'].user, data=preferences).save()
+        DashboardPreferences(
+            user=context['request'].user,
+            dashboard_id=dashboard.get_id(),
+            data=preferences
+        ).save()
 
     context.update({
         'template': dashboard.template,

admin_tools/dashboard/urls.py

 from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('admin_tools.dashboard.views',
-    url(r'^set_preferences/$', 'set_preferences', name='admin-tools-dashboard-set-preferences'),
+    url(r'^set_preferences/(?P<dashboard_id>.+)/$', 'set_preferences', name='admin-tools-dashboard-set-preferences'),
 )

admin_tools/dashboard/views.py

 
 @login_required
 @csrf_exempt
-def set_preferences(request):
+def set_preferences(request, dashboard_id):
     """
     This view serves and validates a preferences form.
     """
     try:
-        preferences = DashboardPreferences.objects.get(user=request.user)
+        preferences = DashboardPreferences.objects.get(
+            user=request.user,
+            dashboard_id=dashboard_id
+        )
     except DashboardPreferences.DoesNotExist:
         preferences = None
     if request.method == "POST":
         elif request.is_ajax():
             return HttpResponse('false')
     else:
-        form = DashboardPreferencesForm(user=request.user, instance=preferences)
+        form = DashboardPreferencesForm(
+            user=request.user,
+            instance=preferences
+        )
     return direct_to_template(request, 'admin_tools/dashboard/preferences_form.html', {
         'form': form,   
     })
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.