Revision ce80d7ae

b/snf-astakos-app/astakos/im/migrations/0042_auto__del_field_projectapplication_project.py
1
# encoding: utf-8
2
import datetime
3
from south.db import db
4
from south.v2 import SchemaMigration
5
from django.db import models
6

  
7
class Migration(SchemaMigration):
8

  
9
    def forwards(self, orm):
10
        
11
        # Deleting field 'ProjectApplication.project'
12
        db.delete_column('im_projectapplication', 'project_id')
13

  
14

  
15
    def backwards(self, orm):
16
        
17
        # Adding field 'ProjectApplication.project'
18
        db.add_column('im_projectapplication', 'project', self.gf('django.db.models.fields.related.ForeignKey')(related_name='applications', null=True, to=orm['im.Project']), keep_default=False)
19

  
20

  
21
    models = {
22
        'auth.group': {
23
            'Meta': {'object_name': 'Group'},
24
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
25
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
26
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
27
        },
28
        'auth.permission': {
29
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
30
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
31
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
32
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34
        },
35
        'auth.user': {
36
            'Meta': {'object_name': 'User'},
37
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
40
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
41
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
42
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
43
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
44
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
45
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
46
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
47
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
48
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
49
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
50
        },
51
        'contenttypes.contenttype': {
52
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
53
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
54
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
55
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
56
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
57
        },
58
        'im.additionalmail': {
59
            'Meta': {'object_name': 'AdditionalMail'},
60
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
61
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
62
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
63
        },
64
        'im.approvalterms': {
65
            'Meta': {'object_name': 'ApprovalTerms'},
66
            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 413677)', 'db_index': 'True'}),
67
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
68
            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
69
        },
70
        'im.astakosgroup': {
71
            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
72
            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
73
            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 404439)'}),
74
            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
75
            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
76
            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
77
            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
78
            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
79
            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
80
            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
81
            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
82
            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
83
            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
84
        },
85
        'im.astakosgroupquota': {
86
            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
87
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
88
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
89
            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
90
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
91
            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
92
        },
93
        'im.astakosuser': {
94
            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
95
            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
96
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
97
            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
98
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
99
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
100
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
101
            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
102
            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
103
            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
104
            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
105
            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
106
            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
107
            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
108
            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
109
            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
110
            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
111
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
112
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
113
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
114
            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
115
            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
116
        },
117
        'im.astakosuserauthprovider': {
118
            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
119
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
120
            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
121
            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
122
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
123
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
124
            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
125
            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
126
            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
127
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
128
        },
129
        'im.astakosuserquota': {
130
            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
131
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
132
            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
133
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
134
            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
135
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
136
        },
137
        'im.emailchange': {
138
            'Meta': {'object_name': 'EmailChange'},
139
            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
140
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
141
            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
142
            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 415411)'}),
143
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
144
        },
145
        'im.groupkind': {
146
            'Meta': {'object_name': 'GroupKind'},
147
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
148
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
149
        },
150
        'im.invitation': {
151
            'Meta': {'object_name': 'Invitation'},
152
            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
153
            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
154
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
155
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
156
            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
157
            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
158
            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
159
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
160
        },
161
        'im.memberjoinpolicy': {
162
            'Meta': {'object_name': 'MemberJoinPolicy'},
163
            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
164
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
165
            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
166
        },
167
        'im.memberleavepolicy': {
168
            'Meta': {'object_name': 'MemberLeavePolicy'},
169
            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
170
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
171
            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
172
        },
173
        'im.membership': {
174
            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
175
            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
176
            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 410862)', 'blank': 'True'}),
177
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
178
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
179
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
180
        },
181
        'im.pendingthirdpartyuser': {
182
            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
183
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
184
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
185
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
186
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
187
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
188
            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
189
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
190
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
191
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
192
            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
193
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
194
        },
195
        'im.project': {
196
            'Meta': {'object_name': 'Project'},
197
            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
198
            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
199
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
200
            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
201
            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
202
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
203
            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
204
            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
205
        },
206
        'im.projectapplication': {
207
            'Meta': {'object_name': 'ProjectApplication'},
208
            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
209
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
210
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
211
            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
212
            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
213
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
214
            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
215
            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
216
            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
217
            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
218
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
219
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
220
            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
221
            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
222
            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
223
            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
224
        },
225
        'im.projectmembership': {
226
            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
227
            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
228
            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
229
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
230
            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
231
            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
232
            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
233
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
234
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
235
            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 447638)'}),
236
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
237
        },
238
        'im.projectmembershiphistory': {
239
            'Meta': {'object_name': 'ProjectMembershipHistory'},
240
            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
241
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
242
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
243
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
244
            'reason': ('django.db.models.fields.IntegerField', [], {}),
245
            'serial': ('django.db.models.fields.BigIntegerField', [], {})
246
        },
247
        'im.projectresourcegrant': {
248
            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
249
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
250
            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
251
            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
252
            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
253
            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
254
            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
255
            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
256
            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
257
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
258
        },
259
        'im.resource': {
260
            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
261
            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
262
            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
263
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
264
            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
265
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
266
            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
267
            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
268
        },
269
        'im.resourcemetadata': {
270
            'Meta': {'object_name': 'ResourceMetadata'},
271
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
272
            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
273
            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
274
        },
275
        'im.serial': {
276
            'Meta': {'object_name': 'Serial'},
277
            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
278
        },
279
        'im.service': {
280
            'Meta': {'object_name': 'Service'},
281
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
282
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
283
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
284
            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
285
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
286
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
287
            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
288
        },
289
        'im.sessioncatalog': {
290
            'Meta': {'object_name': 'SessionCatalog'},
291
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
292
            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
293
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
294
        }
295
    }
296

  
297
    complete_apps = ['im']
b/snf-astakos-app/astakos/im/models.py
1811 1811

  
1812 1812
        if not remove:
1813 1813
            # second, add each new limit to its inverted current
1814
            new_grants = self.pending_application.resourcegrant_set.all()
1814
            new_grants = self.pending_application.projectresourcegrant_set.all()
1815 1815
            for new_grant in new_grants:
1816 1816
                name = new_grant.resource.name
1817 1817
                cur_grant = tmp_grants.pop(name, None)

Also available in: Unified diff