Revision 26551b92

b/snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py
40 40 

  		





  41
  41
  
    
from astakos.im.models import (


  		





  42
  42
  
    
    AstakosUser,


  		





  43
  
  
    
    Resource, Service, RESOURCE_SEPARATOR,


  		





  44
  
  
    
    Project, ProjectApplication, ProjectMembership)


  		





  
  43
  
    
    Resource, Service, Project, ProjectApplication, ProjectMembership)


  		





  45
  44
  
    
from astakos.im.api.backends.base import (


  		





  46
  45
  
    
    BaseBackend, SuccessResult, FailureResult)


  		





  47
  46
  
    
from astakos.im.api.backends.errors import (


  		





  ......




  247
  246
  
    
            t = (i if i else 0 for i in t)


  		





  248
  247
  
    
            (entity, name, quantity, capacity, importLimit, exportLimit,


  		





  249
  248
  
    
             imported, exported, returned, released, flags) = t


  		





  250
  
  
    
            service, sep, resource = name.partition(RESOURCE_SEPARATOR)


  		





  251
  
  
    
            resource = Resource.objects.select_related().get(


  		





  252
  
  
    
                service__name=service, name=resource)


  		





  
  249
  
    
            resource = Resource.objects.select_related().get(name=name)


  		





  253
  250
  
    
            currValue=quantity + imported - released - exported + returned


  		





  254
  251
  
    
            d = dict(name=name,


  		





  255
  252
  
    
                     description=resource.desc,


  		












  

    
      b/snf-astakos-app/astakos/im/forms.py
    
  






  57
  57
  
    

  		





  58
  58
  
    
from astakos.im.models import (


  		





  59
  59
  
    
    AstakosUser, EmailChange, Invitation,


  		





  60
  
  
    
    Resource, PendingThirdPartyUser, get_latest_terms, RESOURCE_SEPARATOR,


  		





  
  60
  
    
    Resource, PendingThirdPartyUser, get_latest_terms,


  		





  61
  61
  
    
    ProjectApplication, Project)


  		





  62
  62
  
    
from astakos.im.settings import (


  		





  63
  63
  
    
    INVITATIONS_PER_LEVEL, BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY,


  		





  ......




  865
  865
  
    
            if name.endswith('_uplimit'):


  		





  866
  866
  
    
                subs = name.split('_uplimit')


  		





  867
  867
  
    
                prefix, suffix = subs


  		





  868
  
  
    
                s, sep, r = prefix.partition(RESOURCE_SEPARATOR)


  		





  869
  
  
    
                resource = Resource.objects.get(service__name=s, name=r)


  		





  
  868
  
    
                resource = Resource.objects.get(name=prefix)


  		





  870
  869
  
    

  		





  871
  870
  
    
                # keep only resource limits for selected resource groups


  		





  872
  871
  
    
                if self.data.get(


  		





  ......




  874
  873
  
    
                 ) == "1":


  		





  875
  874
  
    
                    d = model_to_dict(resource)


  		





  876
  875
  
    
                    if uplimit:


  		





  877
  
  
    
                        d.update(dict(service=s, resource=r, uplimit=uplimit))


  		





  
  876
  
    
                        d.update(dict(resource=prefix, uplimit=uplimit))


  		





  878
  877
  
    
                    else:


  		





  879
  
  
    
                        d.update(dict(service=s, resource=r, uplimit=None))


  		





  
  878
  
    
                        d.update(dict(resource=prefix, uplimit=None))


  		





  880
  879
  
    
                    append(d)


  		





  881
  880
  
    

  		





  882
  881
  
    
        ordered_keys = RESOURCES_PRESENTATION_DATA['resources_order']


  		












  

    
      b/snf-astakos-app/astakos/im/management/commands/user-set-initial-quota.py
    
  






  154
  154
  
    

  		





  155
  155
  
    
        if capacity == 'default':


  		





  156
  156
  
    
            try:


  		





  157
  
  
    
                service, sep, name = resource.partition('.')


  		





  158
  157
  
    
                q = AstakosUserQuota.objects.get(


  		





  159
  158
  
    
                        user=user,


  		





  160
  
  
    
                        resource__service__name=service,


  		





  
  159
  
    
                        resource__name=resource,


  		





  161
  160
  
    
                        resource__name=name)


  		





  162
  161
  
    
                q.delete()


  		





  163
  162
  
    
            except Exception as e:


  		












  

    
      b/snf-astakos-app/astakos/im/migrations/0027_auto__del_field_resource_group__chg_field_resource_service.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 'Resource.group'


  		





  
  12
  
    
        db.delete_column('im_resource', 'group')


  		





  
  13
  
    

  		





  
  14
  
    
        # Renaming column for 'Resource.service' to match new field type.


  		





  
  15
  
    
        db.rename_column('im_resource', 'service_id', 'service')


  		





  
  16
  
    
        # Changing field 'Resource.service'


  		





  
  17
  
    
        db.alter_column('im_resource', 'service', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))


  		





  
  18
  
    

  		





  
  19
  
    
        # Removing index on 'Resource', fields ['service']


  		





  
  20
  
    
        db.delete_index('im_resource', ['service_id'])


  		





  
  21
  
    

  		





  
  22
  
    

  		





  
  23
  
    
    def backwards(self, orm):


  		





  
  24
  
    
        


  		





  
  25
  
    
        # Adding index on 'Resource', fields ['service']


  		





  
  26
  
    
        db.create_index('im_resource', ['service_id'])


  		





  
  27
  
    

  		





  
  28
  
    
        # Adding field 'Resource.group'


  		





  
  29
  
    
        db.add_column('im_resource', 'group', self.gf('django.db.models.fields.CharField')(max_length=255, null=True), keep_default=False)


  		





  
  30
  
    

  		





  
  31
  
    
        # User chose to not deal with backwards NULL issues for 'Resource.service'


  		





  
  32
  
    
        raise RuntimeError("Cannot reverse this migration. 'Resource.service' and its values cannot be restored.")


  		





  
  33
  
    

  		





  
  34
  
    

  		





  
  35
  
    
    models = {


  		





  
  36
  
    
        'auth.group': {


  		





  
  37
  
    
            'Meta': {'object_name': 'Group'},


  		





  
  38
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  39
  
    
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),


  		





  
  40
  
    
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})


  		





  
  41
  
    
        },


  		





  
  42
  
    
        'auth.permission': {


  		





  
  43
  
    
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},


  		





  
  44
  
    
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),


  		





  
  45
  
    
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),


  		





  
  46
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  47
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})


  		





  
  48
  
    
        },


  		





  
  49
  
    
        'auth.user': {


  		





  
  50
  
    
            'Meta': {'object_name': 'User'},


  		





  
  51
  
    
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),


  		





  
  52
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),


  		





  
  53
  
    
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),


  		





  
  54
  
    
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),


  		





  
  55
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  56
  
    
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),


  		





  
  57
  
    
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  58
  
    
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  59
  
    
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),


  		





  
  60
  
    
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),


  		





  
  61
  
    
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),


  		





  
  62
  
    
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),


  		





  
  63
  
    
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})


  		





  
  64
  
    
        },


  		





  
  65
  
    
        'contenttypes.contenttype': {


  		





  
  66
  
    
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},


  		





  
  67
  
    
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),


  		





  
  68
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  69
  
    
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),


  		





  
  70
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})


  		





  
  71
  
    
        },


  		





  
  72
  
    
        'im.additionalmail': {


  		





  
  73
  
    
            'Meta': {'object_name': 'AdditionalMail'},


  		





  
  74
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),


  		





  
  75
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  76
  
    
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})


  		





  
  77
  
    
        },


  		





  
  78
  
    
        'im.approvalterms': {


  		





  
  79
  
    
            'Meta': {'object_name': 'ApprovalTerms'},


  		





  
  80
  
    
            'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),


  		





  
  81
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  82
  
    
            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})


  		





  
  83
  
    
        },


  		





  
  84
  
    
        'im.astakosuser': {


  		





  
  85
  
    
            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},


  		





  
  86
  
    
            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  87
  
    
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  88
  
    
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),


  		





  
  89
  
    
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),


  		





  
  90
  
    
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),


  		





  
  91
  
    
            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  92
  
    
            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  93
  
    
            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  94
  
    
            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  95
  
    
            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  96
  
    
            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),


  		





  
  97
  
    
            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  98
  
    
            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),


  		





  
  99
  
    
            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),


  		





  
  100
  
    
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  101
  
    
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  102
  
    
            'updated': ('django.db.models.fields.DateTimeField', [], {}),


  		





  
  103
  
    
            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),


  		





  
  104
  
    
            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})


  		





  
  105
  
    
        },


  		





  
  106
  
    
        'im.astakosuserauthprovider': {


  		





  
  107
  
    
            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},


  		





  
  108
  
    
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),


  		





  
  109
  
    
            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  110
  
    
            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),


  		





  
  111
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  112
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  113
  
    
            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  114
  
    
            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),


  		





  
  115
  
    
            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),


  		





  
  116
  
    
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})


  		





  
  117
  
    
        },


  		





  
  118
  
    
        'im.astakosuserquota': {


  		





  
  119
  
    
            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},


  		





  
  120
  
    
            'capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'max_digits': '38', 'decimal_places': '0'}),


  		





  
  121
  
    
            'export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  122
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  123
  
    
            'import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  124
  
    
            'quantity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '0', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  125
  
    
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),


  		





  
  126
  
    
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})


  		





  
  127
  
    
        },


  		





  
  128
  
    
        'im.authproviderpolicyprofile': {


  		





  
  129
  
    
            'Meta': {'ordering': "['priority']", 'object_name': 'AuthProviderPolicyProfile'},


  		





  
  130
  
    
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),


  		





  
  131
  
    
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authpolicy_profiles'", 'symmetrical': 'False', 'to': "orm['auth.Group']"}),


  		





  
  132
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  133
  
    
            'is_exclusive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  134
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),


  		





  
  135
  
    
            'policy_add': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  136
  
    
            'policy_automoderate': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  137
  
    
            'policy_create': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  138
  
    
            'policy_limit': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}),


  		





  
  139
  
    
            'policy_login': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  140
  
    
            'policy_remove': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  141
  
    
            'policy_required': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  142
  
    
            'policy_switch': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),


  		





  
  143
  
    
            'priority': ('django.db.models.fields.IntegerField', [], {'default': '1'}),


  		





  
  144
  
    
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}),


  		





  
  145
  
    
            'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authpolicy_profiles'", 'symmetrical': 'False', 'to': "orm['im.AstakosUser']"})


  		





  
  146
  
    
        },


  		





  
  147
  
    
        'im.chain': {


  		





  
  148
  
    
            'Meta': {'object_name': 'Chain'},


  		





  
  149
  
    
            'chain': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})


  		





  
  150
  
    
        },


  		





  
  151
  
    
        'im.emailchange': {


  		





  
  152
  
    
            'Meta': {'object_name': 'EmailChange'},


  		





  
  153
  
    
            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),


  		





  
  154
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  155
  
    
            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),


  		





  
  156
  
    
            'requested_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  157
  
    
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})


  		





  
  158
  
    
        },


  		





  
  159
  
    
        'im.invitation': {


  		





  
  160
  
    
            'Meta': {'object_name': 'Invitation'},


  		





  
  161
  
    
            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),


  		





  
  162
  
    
            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  163
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  164
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  165
  
    
            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),


  		





  
  166
  
    
            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),


  		





  
  167
  
    
            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),


  		





  
  168
  
    
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})


  		





  
  169
  
    
        },


  		





  
  170
  
    
        'im.pendingthirdpartyuser': {


  		





  
  171
  
    
            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},


  		





  
  172
  
    
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  173
  
    
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),


  		





  
  174
  
    
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),


  		





  
  175
  
    
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),


  		





  
  176
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  177
  
    
            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),


  		





  
  178
  
    
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),


  		





  
  179
  
    
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),


  		





  
  180
  
    
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  181
  
    
            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),


  		





  
  182
  
    
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})


  		





  
  183
  
    
        },


  		





  
  184
  
    
        'im.project': {


  		





  
  185
  
    
            'Meta': {'object_name': 'Project'},


  		





  
  186
  
    
            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),


  		





  
  187
  
    
            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  188
  
    
            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),


  		





  
  189
  
    
            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),


  		





  
  190
  
    
            'id': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'chained_project'", 'unique': 'True', 'primary_key': 'True', 'db_column': "'id'", 'to': "orm['im.Chain']"}),


  		





  
  191
  
    
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),


  		





  
  192
  
    
            'is_modified': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  193
  
    
            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),


  		





  
  194
  
    
            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),


  		





  
  195
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True', 'null': 'True', 'db_index': 'True'}),


  		





  
  196
  
    
            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})


  		





  
  197
  
    
        },


  		





  
  198
  
    
        'im.projectapplication': {


  		





  
  199
  
    
            'Meta': {'unique_together': "(('chain', 'id'),)", 'object_name': 'ProjectApplication'},


  		





  
  200
  
    
            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),


  		





  
  201
  
    
            'chain': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'chained_apps'", 'db_column': "'chain'", 'to': "orm['im.Chain']"}),


  		





  
  202
  
    
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  203
  
    
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  204
  
    
            'end_date': ('django.db.models.fields.DateTimeField', [], {}),


  		





  
  205
  
    
            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),


  		





  
  206
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  207
  
    
            'issue_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  208
  
    
            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),


  		





  
  209
  
    
            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),


  		





  
  210
  
    
            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),


  		





  
  211
  
    
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),


  		





  
  212
  
    
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),


  		





  
  213
  
    
            'precursor_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True', 'blank': 'True'}),


  		





  
  214
  
    
            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),


  		





  
  215
  
    
            'response': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  216
  
    
            'response_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  217
  
    
            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),


  		





  
  218
  
    
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})


  		





  
  219
  
    
        },


  		





  
  220
  
    
        'im.projectmembership': {


  		





  
  221
  
    
            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},


  		





  
  222
  
    
            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),


  		





  
  223
  
    
            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),


  		





  
  224
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  225
  
    
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  226
  
    
            'is_pending': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),


  		





  
  227
  
    
            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),


  		





  
  228
  
    
            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),


  		





  
  229
  
    
            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),


  		





  
  230
  
    
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),


  		





  
  231
  
    
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),


  		





  
  232
  
    
            'request_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  233
  
    
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})


  		





  
  234
  
    
        },


  		





  
  235
  
    
        'im.projectmembershiphistory': {


  		





  
  236
  
    
            'Meta': {'object_name': 'ProjectMembershipHistory'},


  		





  
  237
  
    
            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),


  		





  
  238
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  239
  
    
            'person': ('django.db.models.fields.BigIntegerField', [], {}),


  		





  
  240
  
    
            'project': ('django.db.models.fields.BigIntegerField', [], {}),


  		





  
  241
  
    
            'reason': ('django.db.models.fields.IntegerField', [], {}),


  		





  
  242
  
    
            'serial': ('django.db.models.fields.BigIntegerField', [], {})


  		





  
  243
  
    
        },


  		





  
  244
  
    
        'im.projectresourcegrant': {


  		





  
  245
  
    
            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},


  		





  
  246
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  247
  
    
            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  248
  
    
            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  249
  
    
            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  250
  
    
            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),


  		





  
  251
  
    
            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  252
  
    
            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  253
  
    
            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),


  		





  
  254
  
    
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})


  		





  
  255
  
    
        },


  		





  
  256
  
    
        'im.resource': {


  		





  
  257
  
    
            'Meta': {'object_name': 'Resource'},


  		





  
  258
  
    
            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),


  		





  
  259
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  260
  
    
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),


  		





  
  261
  
    
            'service': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),


  		





  
  262
  
    
            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),


  		





  
  263
  
    
            'uplimit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '0', 'max_digits': '38', 'decimal_places': '0'})


  		





  
  264
  
    
        },


  		





  
  265
  
    
        'im.serial': {


  		





  
  266
  
    
            'Meta': {'object_name': 'Serial'},


  		





  
  267
  
    
            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})


  		





  
  268
  
    
        },


  		





  
  269
  
    
        'im.service': {


  		





  
  270
  
    
            'Meta': {'ordering': "('order',)", 'object_name': 'Service'},


  		





  
  271
  
    
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),


  		





  
  272
  
    
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),


  		





  
  273
  
    
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),


  		





  
  274
  
    
            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),


  		





  
  275
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  276
  
    
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),


  		





  
  277
  
    
            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),


  		





  
  278
  
    
            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})


  		





  
  279
  
    
        },


  		





  
  280
  
    
        'im.sessioncatalog': {


  		





  
  281
  
    
            'Meta': {'object_name': 'SessionCatalog'},


  		





  
  282
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  283
  
    
            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),


  		





  
  284
  
    
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})


  		





  
  285
  
    
        },


  		





  
  286
  
    
        'im.usersetting': {


  		





  
  287
  
    
            'Meta': {'unique_together': "(('user', 'setting'),)", 'object_name': 'UserSetting'},


  		





  
  288
  
    
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


  		





  
  289
  
    
            'setting': ('django.db.models.fields.CharField', [], {'max_length': '255'}),


  		





  
  290
  
    
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),


  		





  
  291
  
    
            'value': ('django.db.models.fields.IntegerField', [], {})


  		





  
  292
  
    
        }


  		





  
  293
  
    
    }


  		





  
  294
  
    

  		





  
  295
  
    
    complete_apps = ['im']


  		












  

    
      b/snf-astakos-app/astakos/im/models.py
    
  






  98
  98
  
    
    _content_type = content_type


  		





  99
  99
  
    
    return content_type


  		





  100
  100
  
    

  		





  101
  
  
    
RESOURCE_SEPARATOR = '.'


  		





  102
  
  
    

  		





  103
  101
  
    
inf = float('inf')


  		





  104
  102
  
    

  		





  105
  103
  
    
class Service(models.Model):


  		





  ......




  132
  130
  
    
    def __str__(self):


  		





  133
  131
  
    
        return self.name


  		





  134
  132
  
    

  		





  135
  
  
    
    @property


  		





  136
  
  
    
    def resources(self):


  		





  137
  
  
    
        return self.resource_set.all()


  		





  138
  
  
    

  		





  139
  
  
    
    @resources.setter


  		





  140
  
  
    
    def resources(self, resources):


  		





  141
  
  
    
        for s in resources:


  		





  142
  
  
    
            self.resource_set.create(**s)


  		





  143
  
  
    

  		





  144
  133
  
    

  		





  145
  134
  
    
_presentation_data = {}


  		





  146
  135
  
    
def get_presentation(resource):


  		





  ......




  154
  143
  
    

  		





  155
  144
  
    
class Resource(models.Model):


  		





  156
  145
  
    
    name = models.CharField(_('Name'), max_length=255, unique=True)


  		





  157
  
  
    
    service = models.ForeignKey(Service)


  		





  158
  146
  
    
    desc = models.TextField(_('Description'), null=True)


  		





  159
  
  
    
    unit = models.CharField(_('Name'), null=True, max_length=255)


  		





  160
  
  
    
    group = models.CharField(_('Group'), null=True, max_length=255)


  		





  
  147
  
    
    service = models.CharField(_('Service identifier'), max_length=255,


  		





  
  148
  
    
                               null=True)


  		





  
  149
  
    
    unit = models.CharField(_('Unit'), null=True, max_length=255)


  		





  161
  150
  
    
    uplimit = intDecimalField(default=0)


  		





  162
  151
  
    

  		





  163
  152
  
    
    objects = ForUpdateManager()


  		





  ......




  175
  164
  
    
                }


  		





  176
  165
  
    

  		





  177
  166
  
    
    @property


  		





  
  167
  
    
    def group(self):


  		





  
  168
  
    
        default = self.name


  		





  
  169
  
    
        return get_presentation(str(self)).get('group', default)


  		





  
  170
  
    

  		





  
  171
  
    
    @property


  		





  178
  172
  
    
    def help_text(self):


  		





  179
  
  
    
        return get_presentation(str(self)).get('help_text', '')


  		





  
  173
  
    
        default = "%s resource" % self.name


  		





  
  174
  
    
        return get_presentation(str(self)).get('help_text', default)


  		





  180
  175
  
    

  		





  181
  176
  
    
    @property


  		





  182
  177
  
    
    def help_text_input_each(self):


  		





  183
  
  
    
        return get_presentation(str(self)).get('help_text_input_each', '')


  		





  
  178
  
    
        default = "%s resource" % self.name


  		





  
  179
  
    
        return get_presentation(str(self)).get('help_text_input_each', default)


  		





  184
  180
  
    

  		





  185
  181
  
    
    @property


  		





  186
  182
  
    
    def is_abbreviation(self):


  		





  ......




  188
  184
  
    

  		





  189
  185
  
    
    @property


  		





  190
  186
  
    
    def report_desc(self):


  		





  191
  
  
    
        return get_presentation(str(self)).get('report_desc', '')


  		





  
  187
  
    
        default = "%s resource" % self.name


  		





  
  188
  
    
        return get_presentation(str(self)).get('report_desc', default)


  		





  192
  189
  
    

  		





  193
  190
  
    
    @property


  		





  194
  191
  
    
    def placeholder(self):


  		





  195
  
  
    
        return get_presentation(str(self)).get('placeholder', '')


  		





  
  192
  
    
        return get_presentation(str(self)).get('placeholder', self.unit)


  		





  196
  193
  
    

  		





  197
  194
  
    
    @property


  		





  198
  195
  
    
    def verbose_name(self):


  		





  199
  
  
    
        return get_presentation(str(self)).get('verbose_name', '')


  		





  
  196
  
    
        return get_presentation(str(self)).get('verbose_name', self.name)


  		





  200
  197
  
    

  		





  201
  198
  
    
    @property


  		





  202
  199
  
    
    def display_name(self):


  		





  ......




  408
  405
  
    
            self, resource, capacity,


  		





  409
  406
  
    
            update=True):


  		





  410
  407
  
    
        """Raises ObjectDoesNotExist, IntegrityError"""


  		





  411
  
  
    
        s, sep, r = resource.partition(RESOURCE_SEPARATOR)


  		





  412
  
  
    
        resource = Resource.objects.get(service__name=s, name=r)


  		





  
  408
  
    
        resource = Resource.objects.get(name=resource)


  		





  413
  409
  
    
        if update:


  		





  414
  410
  
    
            AstakosUserQuota.objects.update_or_create(


  		





  415
  411
  
    
                user=self, resource=resource, defaults={


  		





  ......




  422
  418
  
    
                )


  		





  423
  419
  
    

  		





  424
  420
  
    
    def get_resource_policy(self, resource):


  		





  425
  
  
    
        s, sep, r = resource.partition(RESOURCE_SEPARATOR)


  		





  426
  
  
    
        resource = Resource.objects.get(service__name=s, name=r)


  		





  
  421
  
    
        resource = Resource.objects.get(name=resource)


  		





  427
  422
  
    
        default_capacity = resource.uplimit


  		





  428
  423
  
    
        try:


  		





  429
  424
  
    
            policy = AstakosUserQuota.objects.get(user=self, resource=resource)


  		





  ......




  433
  428
  
    

  		





  434
  429
  
    
    def remove_resource_policy(self, service, resource):


  		





  435
  430
  
    
        """Raises ObjectDoesNotExist, IntegrityError"""


  		





  436
  
  
    
        resource = Resource.objects.get(service__name=service, name=resource)


  		





  
  431
  
    
        resource = Resource.objects.get(name=resource)


  		





  437
  432
  
    
        q = self.policies.get(resource=resource).delete()


  		





  438
  433
  
    

  		





  439
  434
  
    
    def update_uuid(self):


  		





  ......




  1445
  1440
  
    
    def add_resource_policy(self, service, resource, uplimit):


  		





  1446
  1441
  
    
        """Raises ObjectDoesNotExist, IntegrityError"""


  		





  1447
  1442
  
    
        q = self.projectresourcegrant_set


  		





  1448
  
  
    
        resource = Resource.objects.get(service__name=service, name=resource)


  		





  
  1443
  
    
        resource = Resource.objects.get(name=resource)


  		





  1449
  1444
  
    
        q.create(resource=resource, member_capacity=uplimit)


  		





  1450
  1445
  
    

  		





  1451
  1446
  
    
    def members_count(self):


  		





  ......




  1453
  1448
  
    

  		





  1454
  1449
  
    
    @property


  		





  1455
  1450
  
    
    def grants(self):


  		





  1456
  
  
    
        return self.projectresourcegrant_set.values(


  		





  1457
  
  
    
            'member_capacity', 'resource__name', 'resource__service__name')


  		





  
  1451
  
    
        return self.projectresourcegrant_set.values('member_capacity',


  		





  
  1452
  
    
                                                    'resource__name')


  		





  1458
  1453
  
    

  		





  1459
  1454
  
    
    @property


  		





  1460
  1455
  
    
    def resource_policies(self):


  		












  

    
      b/snf-astakos-app/astakos/im/templatetags/astakos_tags.py
    
  






  179
  179
  
    
@register.simple_tag


  		





  180
  180
  
    
def get_grant_value(rname, form):


  		





  181
  181
  
    
    grants = form.instance.grants


  		





  182
  
  
    
    service_name, resource_name = rname.split('.',1)


  		





  183
  182
  
    
    try:


  		





  184
  
  
    
        return form.instance.projectresourcegrant_set.get(resource__name=resource_name,


  		





  185
  
  
    
                                                           resource__service__name=service_name).member_capacity


  		





  186
  
  
    
    except:


  		





  187
  
  
    
        return ''


  		





  
  183
  
    
        r = form.instance.projectresourcegrant_set.get(resource__name=rname).member_capacity


  		





  
  184
  
    
    except Exception, e:


  		





  
  185
  
    
        r = ''


  		





  
  186
  
    
    return r


  		





  188
  187
  
    

  		





  189
  188
  
    
@register.tag(name="provider_login_url")


  		





  190
  189
  
    
@basictag(takes_context=True)


  		












  

    
      b/snf-astakos-app/astakos/im/templatetags/filters.py
    
  






  42
  42
  
    
from django.db.models.query import QuerySet


  		





  43
  43
  
    

  		





  44
  44
  
    

  		





  45
  
  
    
from astakos.im.settings import PAGINATE_BY


  		





  46
  
  
    
from astakos.im.presentation import RESOURCES_PRESENTATION_DATA


  		





  47
  
  
    
from astakos.im.models import RESOURCE_SEPARATOR, ProjectResourceGrant


  		





  
  45
  
    
from astakos.im import settings


  		





  
  46
  
    
from astakos.im.models import ProjectResourceGrant


  		





  48
  47
  
    

  		





  49
  48
  
    
register = template.Library()


  		





  50
  49
  
    

  		





  ......




  203
  202
  
    
        grants = project_definition.projectresourcegrant_set


  		





  204
  203
  
    
        grants = grants.values_list(


  		





  205
  204
  
    
            'resource__name',


  		





  206
  
  
    
            'resource__service__name',


  		





  207
  205
  
    
            'member_capacity'


  		





  208
  206
  
    
        )


  		





  209
  
  
    
        return dict((RESOURCE_SEPARATOR.join([e[1], e[0]]), e[2]) for e in grants)


  		





  
  207
  
    
        return dict((e[0], e[1]) for e in grants)


  		





  210
  208
  
    
    except:


  		





  211
  209
  
    
        return {}


  		












  

    
      b/snf-astakos-app/astakos/im/views.py
    
  






  78
  78
  
    
from astakos.im import tables


  		





  79
  79
  
    
from astakos.im.models import (


  		





  80
  80
  
    
    AstakosUser, ApprovalTerms,


  		





  81
  
  
    
    EmailChange, RESOURCE_SEPARATOR,


  		





  82
  
  
    
    AstakosUserAuthProvider, PendingThirdPartyUser,


  		





  
  81
  
    
    EmailChange, AstakosUserAuthProvider, PendingThirdPartyUser,


  		





  83
  82
  
    
    ProjectApplication, ProjectMembership, Project)


  		





  84
  83
  
    
from astakos.im.util import (


  		





  85
  84
  
    
    get_context, prepare_response, get_query, restrict_next)


  		












Also available in:
  Unified diff