Revision 62d30634

b/snf-astakos-app/astakos/api/projects.py
293 293
        is_memb = Q(id__in=memb_projects)
294 294
        owned = (Q(application__owner=request_user) |
295 295
                 Q(application__applicant=request_user))
296
        active = Project.o_state_q(Project.O_ACTIVE)
296
        active = (Project.o_state_q(Project.O_ACTIVE) &
297
                  Q(application__private=False))
297 298
        projects = projects.filter(is_memb | owned | active)
298 299
    return projects.select_related(
299 300
        "application", "application__owner", "application__applicant")
......
365 366
    return value
366 367

  
367 368

  
369
def _get_maybe_boolean(d, key):
370
    value = d.get(key)
371
    if value is not None and not isinstance(value, bool):
372
        raise faults.BadRequest("%s must be boolean" % key)
373
    return value
374

  
375

  
368 376
DOMAIN_VALUE_REGEX = re.compile(
369 377
    r'^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$',
370 378
    re.IGNORECASE)
......
414 422
    if not isinstance(max_members, (int, long)) or max_members < 0:
415 423
        raise faults.BadRequest("Invalid max_members")
416 424

  
425
    private = bool(_get_maybe_boolean(app_data, "private"))
417 426
    homepage = _get_maybe_string(app_data, "homepage")
418 427
    description = _get_maybe_string(app_data, "description")
419 428
    comments = _get_maybe_string(app_data, "comments")
......
432 441
            member_join_policy=join_policy,
433 442
            member_leave_policy=leave_policy,
434 443
            limit_on_members_number=max_members,
444
            private=private,
435 445
            comments=comments,
436 446
            resources=resources,
437 447
            request_user=user)
b/snf-astakos-app/astakos/im/functions.py
343 343
    (lambda u, a: not u or u.is_project_admin()),
344 344
    (lambda u, a: a.owner == u),
345 345
    (lambda u, a: a.applicant == u),
346
    (lambda u, a: a.chain.overall_state() == Project.O_ACTIVE
346
    (lambda u, a: a.chain.overall_state() == Project.O_ACTIVE and not a.private
347 347
     or bool(a.chain.projectmembership_set.any_accepted().filter(person=u))),
348 348
]
349 349

  
......
672 672
                       member_join_policy=None,
673 673
                       member_leave_policy=None,
674 674
                       limit_on_members_number=None,
675
                       private=False,
675 676
                       comments=None,
676 677
                       resources=None,
677 678
                       request_user=None):
......
700 701
        member_join_policy=member_join_policy,
701 702
        member_leave_policy=member_leave_policy,
702 703
        limit_on_members_number=limit_on_members_number,
704
        private=private,
703 705
        comments=comments)
704 706

  
705 707
    if project is None:
b/snf-astakos-app/astakos/im/migrations/0063_auto__add_field_projectapplication_private.py
1
# -*- coding: 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

  
8
class Migration(SchemaMigration):
9

  
10
    def forwards(self, orm):
11
        # Adding field 'ProjectApplication.private'
12
        db.add_column('im_projectapplication', 'private',
13
                      self.gf('django.db.models.fields.BooleanField')(default=False),
14
                      keep_default=False)
15

  
16

  
17
    def backwards(self, orm):
18
        # Deleting field 'ProjectApplication.private'
19
        db.delete_column('im_projectapplication', 'private')
20

  
21

  
22
    models = {
23
        'auth.group': {
24
            'Meta': {'object_name': 'Group'},
25
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
26
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
27
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
28
        },
29
        'auth.permission': {
30
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
31
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
32
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
33
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
35
        },
36
        'auth.user': {
37
            'Meta': {'object_name': 'User'},
38
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
39
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
40
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
41
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
42
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
44
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
45
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
46
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
47
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
48
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
49
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
50
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
51
        },
52
        'contenttypes.contenttype': {
53
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
54
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
55
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
56
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
57
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
58
        },
59
        'im.additionalmail': {
60
            'Meta': {'object_name': 'AdditionalMail'},
61
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
62
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
63
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
64
        },
65
        'im.approvalterms': {
66
            'Meta': {'object_name': 'ApprovalTerms'},
67
            'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
68
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
69
            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
70
        },
71
        'im.astakosuser': {
72
            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
73
            'accepted_email': ('django.db.models.fields.EmailField', [], {'default': 'None', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
74
            'accepted_policy': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
75
            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
76
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
77
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
78
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
79
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
80
            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
81
            'deactivated_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
82
            'deactivated_reason': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True'}),
83
            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
84
            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
85
            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
86
            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
87
            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
88
            'is_rejected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
89
            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
90
            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
91
            'moderated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
92
            'moderated_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
93
            'moderated_data': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
94
            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
95
            'rejected_reason': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
96
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
97
            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
98
            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
99
            'verification_code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'}),
100
            'verified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
101
        },
102
        'im.astakosuserauthprovider': {
103
            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
104
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
105
            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
106
            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
107
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
108
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
109
            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
110
            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
111
            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
112
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
113
        },
114
        'im.astakosuserquota': {
115
            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
116
            'capacity': ('django.db.models.fields.BigIntegerField', [], {}),
117
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
118
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
119
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
120
        },
121
        'im.authproviderpolicyprofile': {
122
            'Meta': {'ordering': "['priority']", 'object_name': 'AuthProviderPolicyProfile'},
123
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
124
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authpolicy_profiles'", 'symmetrical': 'False', 'to': "orm['auth.Group']"}),
125
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
126
            'is_exclusive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
127
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
128
            'policy_add': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
129
            'policy_automoderate': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
130
            'policy_create': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
131
            'policy_limit': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}),
132
            'policy_login': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
133
            'policy_remove': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
134
            'policy_required': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
135
            'policy_switch': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
136
            'priority': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
137
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
138
            'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authpolicy_profiles'", 'symmetrical': 'False', 'to': "orm['im.AstakosUser']"})
139
        },
140
        'im.chain': {
141
            'Meta': {'object_name': 'Chain'},
142
            'chain': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
143
        },
144
        'im.component': {
145
            'Meta': {'object_name': 'Component'},
146
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
147
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
148
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
149
            'base_url': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}),
150
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
151
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
152
            'url': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'})
153
        },
154
        'im.emailchange': {
155
            'Meta': {'object_name': 'EmailChange'},
156
            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
157
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
158
            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
159
            'requested_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
160
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
161
        },
162
        'im.endpoint': {
163
            'Meta': {'object_name': 'Endpoint'},
164
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
165
            'service': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'endpoints'", 'to': "orm['im.Service']"})
166
        },
167
        'im.endpointdata': {
168
            'Meta': {'unique_together': "(('endpoint', 'key'),)", 'object_name': 'EndpointData'},
169
            'endpoint': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'data'", 'to': "orm['im.Endpoint']"}),
170
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
171
            'key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
172
            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
173
        },
174
        'im.invitation': {
175
            'Meta': {'object_name': 'Invitation'},
176
            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
177
            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
178
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
179
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
180
            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
181
            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
182
            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
183
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
184
        },
185
        'im.pendingthirdpartyuser': {
186
            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
187
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
188
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
189
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
190
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
191
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
192
            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
193
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
194
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
195
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
196
            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
197
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
198
        },
199
        'im.project': {
200
            'Meta': {'object_name': 'Project'},
201
            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
202
            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
203
            'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True', 'db_column': "'id'"}),
204
            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
205
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True', 'null': 'True', 'db_index': 'True'}),
206
            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})
207
        },
208
        'im.projectapplication': {
209
            'Meta': {'unique_together': "(('chain', 'id'),)", 'object_name': 'ProjectApplication'},
210
            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
211
            'chain': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'chained_apps'", 'db_column': "'chain'", 'to': "orm['im.Project']"}),
212
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
213
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
214
            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
215
            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
216
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
217
            'issue_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
218
            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
219
            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
220
            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
221
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
222
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
223
            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
224
            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
225
            'response': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
226
            'response_actor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'responded_apps'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
227
            'response_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
228
            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
229
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
230
            'waive_actor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'waived_apps'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
231
            'waive_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
232
            'waive_reason': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
233
        },
234
        'im.projectlock': {
235
            'Meta': {'object_name': 'ProjectLock'},
236
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
237
        },
238
        'im.projectlog': {
239
            'Meta': {'object_name': 'ProjectLog'},
240
            'actor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']", 'null': 'True'}),
241
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True'}),
242
            'date': ('django.db.models.fields.DateTimeField', [], {}),
243
            'from_state': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
244
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
245
            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'log'", 'to': "orm['im.Project']"}),
246
            'reason': ('django.db.models.fields.TextField', [], {'null': 'True'}),
247
            'to_state': ('django.db.models.fields.IntegerField', [], {})
248
        },
249
        'im.projectmembership': {
250
            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
251
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
252
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
253
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
254
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
255
        },
256
        'im.projectmembershiplog': {
257
            'Meta': {'object_name': 'ProjectMembershipLog'},
258
            'actor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']", 'null': 'True'}),
259
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True'}),
260
            'date': ('django.db.models.fields.DateTimeField', [], {}),
261
            'from_state': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
262
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
263
            'membership': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'log'", 'to': "orm['im.ProjectMembership']"}),
264
            'reason': ('django.db.models.fields.TextField', [], {'null': 'True'}),
265
            'to_state': ('django.db.models.fields.IntegerField', [], {})
266
        },
267
        'im.projectresourcegrant': {
268
            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
269
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
270
            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}),
271
            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
272
            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
273
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
274
        },
275
        'im.resource': {
276
            'Meta': {'object_name': 'Resource'},
277
            'api_visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
278
            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
279
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
280
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
281
            'service_origin': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
282
            'service_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
283
            'ui_visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
284
            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
285
            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'default': '0'})
286
        },
287
        'im.service': {
288
            'Meta': {'object_name': 'Service'},
289
            'component': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Component']"}),
290
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
291
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
292
            'type': ('django.db.models.fields.CharField', [], {'max_length': '255'})
293
        },
294
        'im.sessioncatalog': {
295
            'Meta': {'object_name': 'SessionCatalog'},
296
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
297
            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
298
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
299
        },
300
        'im.usersetting': {
301
            'Meta': {'unique_together': "(('user', 'setting'),)", 'object_name': 'UserSetting'},
302
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
303
            'setting': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
304
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
305
            'value': ('django.db.models.fields.IntegerField', [], {})
306
        }
307
    }
308

  
309
    complete_apps = ['im']
b/snf-astakos-app/astakos/im/models.py
1328 1328
    waive_reason = models.TextField(null=True, blank=True)
1329 1329
    waive_actor = models.ForeignKey(AstakosUser, null=True,
1330 1330
                                    related_name='waived_apps')
1331
    private = models.BooleanField(default=False)
1331 1332

  
1332 1333
    objects = ProjectApplicationManager()
1333 1334

  

Also available in: Unified diff