diff --git a/sso/admin.py b/sso/admin.py index 084c10f..3917a9e 100644 --- a/sso/admin.py +++ b/sso/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin from django.contrib.auth.models import User from django.contrib.auth.admin import UserAdmin -from sso.models import Service, ServiceAccount, SSOUser +from sso.models import Service, ServiceAccount, SSOUser, SSOUserNote class ServiceAdmin(admin.ModelAdmin): list_display = ('name', 'url', 'api', 'active') @@ -28,3 +28,9 @@ class SSOUserAdmin(UserAdmin): # Re-register UserAdmin admin.site.unregister(User) admin.site.register(User, SSOUserAdmin) + +class SSOUserNoteAdmin(admin.ModelAdmin): + list_display = ('user', 'note', 'date_created', 'created_by') + +admin.site.register(SSOUserNote, SSOUserNoteAdmin) + diff --git a/sso/migrations/0003_auto__add_ssousernote.py b/sso/migrations/0003_auto__add_ssousernote.py new file mode 100644 index 0000000..d8051de --- /dev/null +++ b/sso/migrations/0003_auto__add_ssousernote.py @@ -0,0 +1,99 @@ +# 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 model 'SSOUserNote' + db.create_table('sso_ssousernote', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='notes', to_field='User', to=orm['auth.User'])), + ('note', self.gf('django.db.models.fields.TextField')()), + ('created_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], to_field='Created By')), + ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + )) + db.send_create_signal('sso', ['SSOUserNote']) + + + def backwards(self, orm): + + # Deleting model 'SSOUserNote' + db.delete_table('sso_ssousernote') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'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', 'blank': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + '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', [], {'max_length': '30', 'unique': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'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'}) + }, + 'sso.service': { + 'Meta': {'object_name': 'Service'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), + 'api': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'settings_json': ('jsonfield.fields.JSONField', [], {'blank': 'True'}), + 'url': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}) + }, + 'sso.serviceaccount': { + 'Meta': {'object_name': 'ServiceAccount'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sso.Service']"}), + 'service_uid': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'sso.ssouser': { + 'Meta': {'object_name': 'SSOUser'}, + 'api_service_password': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'sso.ssousernote': { + 'Meta': {'object_name': 'SSOUserNote'}, + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'to_field': "'Created By'"}), + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to_field': "'User'", 'to': "orm['auth.User']"}) + } + } + + complete_apps = ['sso'] diff --git a/sso/models.py b/sso/models.py index 13f2704..0fa60e5 100644 --- a/sso/models.py +++ b/sso/models.py @@ -118,6 +118,17 @@ class SSOUser(models.Model): signals.post_save.connect(SSOUser.create_user_profile, sender=User) #signals.post_save.connect(SSOUser.update_service_groups, sender=User) +class SSOUserNote(models.Model): + """ Notes bound to a user's account. Used to store information regarding the user """ + + user = models.ForeignKey(User, "User", blank=False, null=False, related_name='notes') + note = models.TextField("Note", blank=False, null=False) + created_by = models.ForeignKey(User, "Created By", blank=False, null=False) + date_created = models.DateTimeField(auto_now_add=True, blank=False, null=False, + verbose_name="Date/Time the note was added", + help_text="Shows the date and time the note was added to the account") + + class Service(models.Model): """ Service model represents a service available to users, either a website or