From: Ciro Scognamiglio Date: Tue, 27 Jan 2015 17:52:25 +0000 (+0100) Subject: add new project to pending requests X-Git-Tag: myslice-1.3~97 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c50b70a0ccf850465e2de5d2cb45b4e70283247b;p=unfold.git add new project to pending requests --- diff --git a/portal/actions.py b/portal/actions.py index 9018fbf3..05abf0bd 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -417,7 +417,6 @@ def get_requests(authority_hrns=None): pending_slices = PendingSlice.objects.all() pending_authorities = PendingAuthority.objects.all() pending_projects = PendingProject.objects.all() - print "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" , pending_projects else: pending_users = PendingUser.objects pending_slices = PendingSlice.objects @@ -433,13 +432,11 @@ def get_requests(authority_hrns=None): list_slice_Q.append(Q(authority_hrn__startswith=hrn)) list_auth_Q.append(Q(site_authority__startswith=hrn)) list_proj_Q.append(Q(authority_hrn__startswith=hrn)) - print "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" , list_proj_Q - print "startswith hrn = ",hrn from operator import __or__ as OR pending_users = pending_users.filter(reduce(OR, list_user_Q)) pending_slices = pending_slices.filter(reduce(OR, list_slice_Q)) pending_authorities = pending_authorities.filter(reduce(OR, list_auth_Q)) - pending_projects = pending_projects.filter(reduce(OR, list_auth_Q)) + pending_projects = pending_projects.filter(reduce(OR, list_proj_Q)) #pending_authorities = pending_authorities.all() #filter(reduce(OR, list_Q)) return make_requests(pending_users, pending_slices, pending_authorities, pending_projects) diff --git a/portal/institution.py b/portal/institution.py index d86e3eef..8a004356 100644 --- a/portal/institution.py +++ b/portal/institution.py @@ -38,13 +38,13 @@ class InstitutionView (LoginRequiredAutoLogoutView, ThemeView): env['person'] = self.request.user if authority_hrn is None: # CACHE PB with fields - page = Page(wsgi_request) + page = Page(request) metadata = page.get_metadata() user_md = metadata.details_by_object('user') user_fields = [column['name'] for column in user_md['column']] # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2 - user_query = Query().get('myslice:user').select(user_fields).filter_by('user_hrn','==',user_hrn) + user_query = Query().get('myslice:user').select(user_fields).filter_by('user_hrn','==','$user_hrn') #user_query = Query().get('myslice:user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn') user_details = execute_query(self.request, user_query) try: diff --git a/portal/managementtabrequests.py b/portal/managementtabrequests.py index d1293722..2c80e41f 100644 --- a/portal/managementtabrequests.py +++ b/portal/managementtabrequests.py @@ -88,7 +88,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView): credential_authorities.add(authority_hrn) # CACHE PB with fields - page = Page(wsgi_request) + page = Page(self.request) metadata = page.get_metadata() user_md = metadata.details_by_object('user') user_fields = [column['name'] for column in user_md['column']] diff --git a/portal/migrations/0010_project.py b/portal/migrations/0010_project.py new file mode 100644 index 00000000..70462042 --- /dev/null +++ b/portal/migrations/0010_project.py @@ -0,0 +1,92 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'PendingProject' + db.create_table(u'portal_pendingproject', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('project_name', self.gf('django.db.models.fields.TextField')()), + ('user_hrn', self.gf('django.db.models.fields.TextField')()), + ('authority_hrn', self.gf('django.db.models.fields.TextField')(null=True)), + ('purpose', self.gf('django.db.models.fields.TextField')(default='NA')), + ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + )) + db.send_create_signal(u'portal', ['PendingProject']) + + + def backwards(self, orm): + # Deleting model 'PendingProject' + db.delete_table(u'portal_pendingproject') + + + models = { + u'portal.institution': { + 'Meta': {'object_name': 'Institution'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {}) + }, + u'portal.pendingauthority': { + 'Meta': {'object_name': 'PendingAuthority'}, + 'address_city': ('django.db.models.fields.TextField', [], {}), + 'address_country': ('django.db.models.fields.TextField', [], {}), + 'address_line1': ('django.db.models.fields.TextField', [], {}), + 'address_line2': ('django.db.models.fields.TextField', [], {}), + 'address_line3': ('django.db.models.fields.TextField', [], {}), + 'address_postalcode': ('django.db.models.fields.TextField', [], {}), + 'address_state': ('django.db.models.fields.TextField', [], {}), + 'authority_hrn': ('django.db.models.fields.TextField', [], {}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'site_abbreviated_name': ('django.db.models.fields.TextField', [], {}), + 'site_authority': ('django.db.models.fields.TextField', [], {}), + 'site_latitude': ('django.db.models.fields.TextField', [], {}), + 'site_longitude': ('django.db.models.fields.TextField', [], {}), + 'site_name': ('django.db.models.fields.TextField', [], {}), + 'site_url': ('django.db.models.fields.TextField', [], {}) + }, + u'portal.pendingproject': { + 'Meta': {'object_name': 'PendingProject'}, + 'authority_hrn': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'project_name': ('django.db.models.fields.TextField', [], {}), + 'purpose': ('django.db.models.fields.TextField', [], {'default': "'NA'"}), + 'user_hrn': ('django.db.models.fields.TextField', [], {}) + }, + u'portal.pendingslice': { + 'Meta': {'object_name': 'PendingSlice'}, + 'authority_hrn': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number_of_nodes': ('django.db.models.fields.TextField', [], {'default': '0'}), + 'purpose': ('django.db.models.fields.TextField', [], {'default': "'NA'"}), + 'slice_name': ('django.db.models.fields.TextField', [], {}), + 'type_of_nodes': ('django.db.models.fields.TextField', [], {'default': "'NA'"}), + 'user_hrn': ('django.db.models.fields.TextField', [], {}) + }, + u'portal.pendinguser': { + 'Meta': {'object_name': 'PendingUser'}, + 'authority_hrn': ('django.db.models.fields.TextField', [], {}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), + 'email_hash': ('django.db.models.fields.TextField', [], {}), + 'first_name': ('django.db.models.fields.TextField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_name': ('django.db.models.fields.TextField', [], {}), + 'login': ('django.db.models.fields.TextField', [], {}), + 'password': ('django.db.models.fields.TextField', [], {}), + 'pi': ('django.db.models.fields.TextField', [], {}), + 'private_key': ('django.db.models.fields.TextField', [], {}), + 'public_key': ('django.db.models.fields.TextField', [], {}), + 'status': ('django.db.models.fields.TextField', [], {}), + 'user_hrn': ('django.db.models.fields.TextField', [], {}) + } + } + + complete_apps = ['portal'] \ No newline at end of file