Revision 362ff471

b/snf-astakos-app/astakos/im/management/commands/service-add.py
38 38

  
39 39

  
40 40
class Command(BaseCommand):
41
    args = "<name> <endpoint URL>"
41
    args = "<name> <service URL> <API URL> "
42 42
    help = "Register a service"
43 43

  
44 44
    def handle(self, *args, **options):
......
47 47

  
48 48
        name = args[0]
49 49
        api_url = args[1]
50
        url = args[2]
50 51

  
51 52
        try:
52 53
            s = Service.objects.get(name=name)
......
61 62
            raise CommandError(m)
62 63

  
63 64
        try:
64
            s = Service.objects.create(name=name, api_url=api_url)
65
            s = Service.objects.create(name=name, api_url=api_url, url=url)
65 66
        except BaseException as e:
66 67
            raise CommandError("Failed to create service.")
67 68
        else:
b/snf-astakos-app/astakos/im/management/commands/service-list.py
43 43
    FIELDS = {
44 44
        "id": ("id", "ID"),
45 45
        "name": ("name", "Service Name"),
46
        "url": ("api_url", "Service API url"),
46
        "url": ("url", "Service url"),
47
        "api_url": ("api_url", "Service API url"),
47 48
        "token": ("auth_token", "Authentication token"),
48 49
        "created": ("auth_token_created", "Token creation date"),
49 50
        "expires": ("auth_token_expires", "Token expiration date"),
50 51
    }
51 52

  
52
    fields = ["id", "name", "url", "token", "created", "expires"]
53
    fields = ["id", "name", "url", "api_url", "token", "created", "expires"]
b/snf-astakos-app/astakos/im/management/commands/service-update.py
50 50
                    dest='name',
51 51
                    default=None,
52 52
                    help="Set service name"),
53
        make_option('--url',
54
                    dest='url',
55
                    default=None,
56
                    help="Set service url"),
53 57
        make_option('--api-url',
54 58
                    dest='api_url',
55 59
                    default=None,
......
77 81

  
78 82
        name = options.get('name')
79 83
        api_url = options.get('api_url')
84
        url = options.get('url')
80 85
        auth_token = options.get('auth_token')
81 86
        renew_token = options.get('renew_token')
82 87

  
......
86 91
        if api_url:
87 92
            service.api_url = api_url
88 93

  
94
        if url:
95
            service.url = url
96

  
89 97
        if auth_token:
90 98
            service.auth_token = auth_token
91 99

  
b/snf-astakos-app/astakos/im/migrations/0032_auto__add_field_service_url.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
        # Adding field 'Service.url'
12
        db.add_column('im_service', 'url', self.gf('django.db.models.fields.CharField')(max_length=255, null=True), keep_default=False)
13

  
14

  
15
    def backwards(self, orm):
16
        
17
        # Deleting field 'Service.url'
18
        db.delete_column('im_service', 'url')
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', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
67
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
68
            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
69
        },
70
        'im.astakosuser': {
71
            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
72
            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
73
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
74
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
75
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
76
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
77
            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
78
            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
79
            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
80
            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
81
            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
82
            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
83
            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
84
            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
85
            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
86
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
87
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
88
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
89
            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
90
            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
91
        },
92
        'im.astakosuserauthprovider': {
93
            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
94
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
95
            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
96
            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
97
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
98
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
99
            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
100
            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
101
            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
102
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
103
        },
104
        'im.astakosuserquota': {
105
            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
106
            'capacity': ('snf_django.lib.db.fields.IntDecimalField', [], {'max_digits': '38', 'decimal_places': '0'}),
107
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
108
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
109
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
110
        },
111
        'im.authproviderpolicyprofile': {
112
            'Meta': {'ordering': "['priority']", 'object_name': 'AuthProviderPolicyProfile'},
113
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
114
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authpolicy_profiles'", 'symmetrical': 'False', 'to': "orm['auth.Group']"}),
115
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
116
            'is_exclusive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
117
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
118
            'policy_add': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
119
            'policy_automoderate': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
120
            'policy_create': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
121
            'policy_limit': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}),
122
            'policy_login': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
123
            'policy_remove': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
124
            'policy_required': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
125
            'policy_switch': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
126
            'priority': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
127
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
128
            'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authpolicy_profiles'", 'symmetrical': 'False', 'to': "orm['im.AstakosUser']"})
129
        },
130
        'im.chain': {
131
            'Meta': {'object_name': 'Chain'},
132
            'chain': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
133
        },
134
        'im.emailchange': {
135
            'Meta': {'object_name': 'EmailChange'},
136
            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
137
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
138
            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
139
            'requested_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
140
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
141
        },
142
        'im.invitation': {
143
            'Meta': {'object_name': 'Invitation'},
144
            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
145
            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
146
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
147
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
148
            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
149
            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
150
            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
151
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
152
        },
153
        'im.pendingthirdpartyuser': {
154
            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
155
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
156
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
157
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
158
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
159
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
160
            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
161
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
162
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
163
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
164
            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
165
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
166
        },
167
        'im.project': {
168
            'Meta': {'object_name': 'Project'},
169
            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
170
            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
171
            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
172
            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
173
            'id': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'chained_project'", 'unique': 'True', 'primary_key': 'True', 'db_column': "'id'", 'to': "orm['im.Chain']"}),
174
            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
175
            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
176
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True', 'null': 'True', 'db_index': 'True'}),
177
            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})
178
        },
179
        'im.projectapplication': {
180
            'Meta': {'unique_together': "(('chain', 'id'),)", 'object_name': 'ProjectApplication'},
181
            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
182
            'chain': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'chained_apps'", 'db_column': "'chain'", 'to': "orm['im.Chain']"}),
183
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
184
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
185
            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
186
            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
187
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
188
            'issue_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
189
            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
190
            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
191
            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
192
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
193
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
194
            'precursor_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True', 'blank': 'True'}),
195
            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
196
            'response': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
197
            'response_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
198
            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
199
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
200
        },
201
        'im.projectmembership': {
202
            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
203
            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
204
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
205
            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
206
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
207
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
208
            'request_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
209
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
210
        },
211
        'im.projectmembershiphistory': {
212
            'Meta': {'object_name': 'ProjectMembershipHistory'},
213
            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
214
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
215
            'person': ('django.db.models.fields.BigIntegerField', [], {}),
216
            'project': ('django.db.models.fields.BigIntegerField', [], {}),
217
            'reason': ('django.db.models.fields.IntegerField', [], {}),
218
            'serial': ('django.db.models.fields.BigIntegerField', [], {})
219
        },
220
        'im.projectresourcegrant': {
221
            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
222
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
223
            'member_capacity': ('snf_django.lib.db.fields.IntDecimalField', [], {'default': '0', 'max_digits': '38', 'decimal_places': '0'}),
224
            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
225
            'project_capacity': ('snf_django.lib.db.fields.IntDecimalField', [], {'null': 'True', 'max_digits': '38', 'decimal_places': '0'}),
226
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
227
        },
228
        'im.resource': {
229
            'Meta': {'object_name': 'Resource'},
230
            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
231
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
232
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
233
            'service': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
234
            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
235
            'uplimit': ('snf_django.lib.db.fields.IntDecimalField', [], {'default': '0', 'max_digits': '38', 'decimal_places': '0'})
236
        },
237
        'im.serial': {
238
            'Meta': {'object_name': 'Serial'},
239
            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
240
        },
241
        'im.service': {
242
            'Meta': {'object_name': 'Service'},
243
            'api_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
244
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
245
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
246
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
247
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
248
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
249
            'url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
250
        },
251
        'im.sessioncatalog': {
252
            'Meta': {'object_name': 'SessionCatalog'},
253
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
254
            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
255
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
256
        },
257
        'im.usersetting': {
258
            'Meta': {'unique_together': "(('user', 'setting'),)", 'object_name': 'UserSetting'},
259
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
260
            'setting': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
261
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
262
            'value': ('django.db.models.fields.IntegerField', [], {})
263
        }
264
    }
265

  
266
    complete_apps = ['im']
b/snf-astakos-app/astakos/im/models.py
121 121
class Service(models.Model):
122 122
    name = models.CharField(_('Name'), max_length=255, unique=True,
123 123
                            db_index=True)
124
    url = models.CharField(_('Service url'), max_length=255, null=True,
125
                           help_text=_("URL the service is accessible from"))
124 126
    api_url = models.CharField(_('Service API url'), max_length=255, null=True)
125 127
    auth_token = models.CharField(_('Authentication Token'), max_length=32,
126 128
                                  null=True, blank=True)

Also available in: Unified diff