Add person to state/tags object history. Fixes #543

- Legacy-Id: 2746

ietf/ietfworkflows/migrations/0003_add_person_to_history.py

@@ -0,0 +1,119 @@
+
+from south.db import db
+from django.db import models
+from ietf.ietfworkflows.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        
+        # Adding field 'ObjectWorkflowHistoryEntry.person'
+        db.add_column('ietfworkflows_objectworkflowhistoryentry', 'person', orm['ietfworkflows.objectworkflowhistoryentry:person'])
+        
+        # Adding field 'ObjectAnnotationTagHistoryEntry.person'
+        db.add_column('ietfworkflows_objectannotationtaghistoryentry', 'person', orm['ietfworkflows.objectannotationtaghistoryentry:person'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'ObjectWorkflowHistoryEntry.person'
+        db.delete_column('ietfworkflows_objectworkflowhistoryentry', 'person_id')
+        
+        # Deleting field 'ObjectAnnotationTagHistoryEntry.person'
+        db.delete_column('ietfworkflows_objectannotationtaghistoryentry', 'person_id')
+        
+    
+    
+    models = {
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", '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'})
+        },
+        'idtracker.personororginfo': {
+            'Meta': {'db_table': "'person_or_org_info'"},
+            'address_type': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
+            'created_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'date_modified': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'first_name_key': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'last_name_key': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'middle_initial': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
+            'middle_initial_key': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
+            'modified_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
+            'name_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'name_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'person_or_org_tag': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'})
+        },
+        'ietfworkflows.annotationtag': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['permissions.Permission']", 'null': 'True', 'blank': 'True'}),
+            'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'annotation_tags'", 'to': "orm['workflows.Workflow']"})
+        },
+        'ietfworkflows.annotationtagobjectrelation': {
+            'annotation_tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ietfworkflows.AnnotationTag']"}),
+            'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'annotation_tags'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'ietfworkflows.objectannotationtaghistoryentry': {
+            'change_date': ('django.db.models.fields.DateTimeField', [], {}),
+            'comment': ('django.db.models.fields.TextField', [], {}),
+            'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'annotation_tags_history'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']"}),
+            'setted': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'unsetted': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'ietfworkflows.objectworkflowhistoryentry': {
+            'comment': ('django.db.models.fields.TextField', [], {}),
+            'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'workflow_history'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
+            'from_state': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']"}),
+            'to_state': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'transition_date': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'ietfworkflows.wgworkflow': {
+            'selected_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['workflows.State']", 'symmetrical': 'False'}),
+            'selected_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ietfworkflows.AnnotationTag']", 'symmetrical': 'False'}),
+            'workflow_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['workflows.Workflow']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'permissions.permission': {
+            'codename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'content_types': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'workflows.state': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'transitions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['workflows.Transition']", 'null': 'True', 'blank': 'True'}),
+            'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'states'", 'to': "orm['workflows.Workflow']"})
+        },
+        'workflows.transition': {
+            'condition': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'destination': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'destination_state'", 'null': 'True', 'to': "orm['workflows.State']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['permissions.Permission']", 'null': 'True', 'blank': 'True'}),
+            'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['workflows.Workflow']"})
+        },
+        'workflows.workflow': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_state': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'workflow_state'", 'null': 'True', 'to': "orm['workflows.State']"}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['permissions.Permission']", 'symmetrical': 'False'})
+        }
+    }
+    
+    complete_apps = ['ietfworkflows']

ietf/ietfworkflows/models.py

@@ -3,6 +3,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from ietf.idtracker.models import PersonOrOrgInfo
 from workflows.models import Workflow, State
 from permissions.models import Permission
 
@@ -16,6 +17,7 @@ class ObjectWorkflowHistoryEntry(models.Model):
     to_state = models.CharField(_('To state'), max_length=100)
     transition_date = models.DateTimeField(_('Transition date'))
     comment = models.TextField(_('Comment'))
+    person = models.ForeignKey(PersonOrOrgInfo)
 
 
 class AnnotationTag(models.Model):
@@ -44,6 +46,7 @@ class ObjectAnnotationTagHistoryEntry(models.Model):
     unsetted = models.TextField(_('Unsetted tags'), blank=True, null=True)
     change_date = models.DateTimeField(_('Change date'))
     comment = models.TextField(_('Comment'))
+    person = models.ForeignKey(PersonOrOrgInfo)
 
 
 class WGWorkflow(Workflow):

ietf/ietfworkflows/utils.py

@@ -126,7 +126,7 @@ def reset_tag_by_name(obj, tag_name):
         return False
 
 
-def update_tags(obj, comment, set_tags=[], reset_tags=[]):
+def update_tags(obj, comment, person, set_tags=[], reset_tags=[]):
     ctype = ContentType.objects.get_for_model(obj)
     setted = []
     resetted = []
@@ -142,4 +142,5 @@ def update_tags(obj, comment, set_tags=[], reset_tags=[]):
         setted = ','.join(setted),
         unsetted = ','.join(resetted),
         change_date = datetime.datetime.now(),
-        comment = comment)
+        comment = comment,
+        person=person)