From 099364f3465712ac0232f9535ee15b3b5f902fa9 Mon Sep 17 00:00:00 2001 From: lombardofr Date: Tue, 12 Jun 2018 11:21:02 +0200 Subject: [PATCH] incomplete support to user and project management Change-Id: I9238ec321a292bb23c5c5797681819794dcfd0f0 Signed-off-by: lombardofr --- .gitignore | 2 + _.sqlite3 | Bin 0 -> 192512 bytes authosm/__init__.py | 0 authosm/admin.py | 3 + authosm/apps.py | 7 + authosm/backend.py | 51 +++ authosm/models.py | 92 +++++ authosm/tests.py | 3 + authosm/views.py | 47 +++ lib/osm/osmclient/client.py | 2 +- projecthandler/models.py | 46 +-- projecthandler/osm_model.py | 148 ++------ .../project/osm/osm_project_descriptors.html | 2 +- projecthandler/urls/project.py | 35 +- projecthandler/views.py | 353 ++++-------------- sf_t3d/settings.py | 8 +- sf_t3d/urls.py | 12 +- sf_t3d/views.py | 10 +- template/base.html | 8 +- template/login.html | 4 + 20 files changed, 335 insertions(+), 498 deletions(-) create mode 100644 _.sqlite3 create mode 100644 authosm/__init__.py create mode 100644 authosm/admin.py create mode 100644 authosm/apps.py create mode 100644 authosm/backend.py create mode 100644 authosm/models.py create mode 100644 authosm/tests.py create mode 100644 authosm/views.py diff --git a/.gitignore b/.gitignore index 06fb943..40f146b 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ static/bower_components projecthandler/migrations/ sf_user/migrations/ instancehandler/migrations +sdnctrlhandler/migrations +authosm/migrations \ No newline at end of file diff --git a/_.sqlite3 b/_.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..fe5e621d2965ab807ef99db709c063aa9aee7262 GIT binary patch literal 192512 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.name}} +
  • {{project_id}}
  • {% if descriptor_type %} {{ descriptor_type }} {% else%} diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py index 452365a..2054656 100644 --- a/projecthandler/urls/project.py +++ b/projecthandler/urls/project.py @@ -20,36 +20,21 @@ from projecthandler import views urlpatterns = [ url(r'^list/', views.user_projects, name='projects_list'), url(r'^new/', views.create_new_project, name='new_project'), - url(r'^(?P\d+)/$', views.open_project, name='open_project'), - url(r'^(?P\d+)/sdn/', include('sdnctrlhandler.urls', namespace='sdns'), name='sdns_base'), - url(r'^(?P\d+)/vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'), - url(r'^(?P\d+)/instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'), - url(r'^(?P\d+)/delete$', views.delete_project, name='delete_project'), - url(r'^(?P\d+)/graph(/$)', views.graph, name='graph_view'), - url(r'^(?P\d+)/graph/graph_data(/$)', views.graph_data, name='graph_data'), - url(r'^(?P\d+)/graph/graph_data/(?P[-\w]+)(/$)', views.graph_data, name='graph_data'), - url(r'^(?P\d+)/graph/positions$', views.graph_positions, name='graph_positions'), - url(r'^(?P\d+)/graph/unusedvnf/(?P\w+)(/$)', views.unused_vnf, name='unused_vnf'), - url(r'^(?P\d+)/graph/addelement$', views.add_element, name='addelement'), - url(r'^(?P\d+)/graph/overviewelement$', views.overviewelement, name='overviewelement'), - url(r'^(?P\d+)/graph/addnodetovnffg', views.add_node_to_vnffg, name='addnodetovnffg'), - url(r'^(?P\d+)/graph/removeelement$', views.remove_element, name='removeelement'), - url(r'^(?P\d+)/graph/addlink$', views.add_link, name='addlink'), - url(r'^(?P\d+)/graph/removelink$', views.remove_link, name='removelink'), - url(r'^(?P\d+)/graph/availablenodes', views.get_available_nodes, name='get_available_nodes'), - url(r'^(?P\d+)/descriptors/(?P\w+)/list$', views.show_descriptors, name='list_descriptors'), - url(r'^(?P\d+)/descriptors/(?P\w+)/(?P[-\w]+)(/$)', + url(r'^(?P\w+)/$', views.open_project, name='open_project'), + url(r'^(?P\w+)/sdn/', include('sdnctrlhandler.urls', namespace='sdns'), name='sdns_base'), + url(r'^(?P\w+)/vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'), + url(r'^(?P\w+)/instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'), + url(r'^(?P\w+)/delete$', views.delete_project, name='delete_project'), + url(r'^(?P\w+)/descriptors/(?P\w+)/list$', views.show_descriptors, name='list_descriptors'), + url(r'^(?P\w+)/descriptors/(?P\w+)/(?P[-\w]+)(/$)', views.edit_descriptor, name='edit_descriptor'), - url(r'^(?P\d+)/descriptors/(?P\w+)/(?P[-\w]+)/delete$', + url(r'^(?P\w+)/descriptors/(?P\w+)/(?P[-\w]+)/delete$', views.delete_descriptor, name='delete_descriptor'), - url(r'^(?P\d+)/descriptors/(?P\w+)/(?P[-\w]+)/clone$', - views.clone_descriptor, - name='clone_descriptor'), - url(r'^(?P\d+)/descriptors/(?P\w+)/(?P[-\w]+)/action/(?P[-\w]+)', + url(r'^(?P\w+)/descriptors/(?P\w+)/(?P[-\w]+)/action/(?P[-\w]+)', views.custom_action, name='custom_action'), - url(r'^(?P\d+)/descriptors/(?P\w+)/new$', views.new_descriptor, + url(r'^(?P\w+)/descriptors/(?P\w+)/new$', views.new_descriptor, name='new_descriptor'), diff --git a/projecthandler/views.py b/projecthandler/views.py index a03ae44..16fb457 100644 --- a/projecthandler/views.py +++ b/projecthandler/views.py @@ -20,22 +20,13 @@ from django.contrib.auth.decorators import login_required from django.http import HttpResponse, JsonResponse from django.middleware.csrf import get_token from django.shortcuts import render, redirect -from django.template.loader import render_to_string from lib.util import Util -from sf_user.models import CustomUser -import tarfile - - from projecthandler.osm_model import OsmProject -from projecthandler.models import Project - +from lib.osm.osmclient.client import Client -Project.add_project_type('osm', OsmProject) -from projecthandler.models import Repository - @login_required def home(request): return render(request, 'home.html', {}) @@ -43,81 +34,14 @@ def home(request): @login_required def create_new_project(request): - if request.method == 'POST': - error_msgs = [] - user = CustomUser.objects.get(id=request.user.id) - name = request.POST.get('name', 'WithoutName') - info = request.POST.get('info', ' ') - type = request.POST.get('type', '') - start_from = request.POST.get('startfrom', 'scratch') - - project_types = Project.get_project_types() - if type in project_types: - project_class = project_types[type] - - else: - # FIXME this error is not handled - error_msgs.append('Project type undefined.') - return render(request, 'error.html', - {'error_msg': 'Error creating new project, project type undefined. Please retry.'}) - - try: - - if start_from == 'scratch': - print 'from scratch' - data_project = {} - - elif start_from == 'files': - print 'from files' - data_project = project_class.data_project_from_files(request) - - elif start_from == 'example': - print 'from example' - data_project = project_class.data_project_from_example(request) - - project = project_class.create_project(name, user, False, info, data_project) - # print project.get_dataproject() - - - except Exception as e: - print 'Error creating ' + type + ' project! Please retry.' - print e - return render(request, 'error.html', {'error_msg': 'Error creating ' + type + ' project! Please retry.'}) - return redirect('projects:open_project', project_id=project.id) - - elif request.method == 'GET': - csrf_token_value = get_token(request) - result = {} - data_type_selector = [{ - 'id': '-1', - 'text': 'Select an option' - }] - type_example_files = {} - type_container_template = '' - project_types = Project.get_project_types() - print "project_types", project_types.keys() - for type in project_types: - project_class = project_types[type] - type_example_files.update(project_class.get_example_list()) - data_type_selector.append({ - 'id': type, - 'text': type, - 'value': type - }) - type_container_template += render_to_string(type + '/' + type + '_new_project.html') - - result.update({'type_example_files': json.dumps(type_example_files)}) - result.update({'data_type_selector': json.dumps(data_type_selector)}) - result.update({'type_container_template': type_container_template}) - result.update({'csrf_token': csrf_token_value}) - return render(request, 'new_project.html', result) + return render(request, 'home.html', {}) @login_required def user_projects(request): csrf_token_value = get_token(request) - user = CustomUser.objects.get(id=request.user.id) - projects = Project.objects.filter(owner=user).select_subclasses() + user = request.user + projects = user.get_projects() return render(request, 'projectlist.html', { 'projects': list(projects), @@ -128,11 +52,25 @@ def user_projects(request): @login_required def open_project(request, project_id=None): try: - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() - prj_token = project_overview['type'] - print request.COOKIES.keys() - return render(request, prj_token + '/' + prj_token + '_project_details.html', + user = request.user + client = Client() + nsd = client.nsd_list() + vnfd = client.vnfd_list() + ns = client.ns_list() + vnf = client.vnf_list() + project_overview = { + 'owner': user.username, + 'name': project_id, + 'updated_date': '-', + 'created_date': '-', + 'info': '-', + 'type': 'osm', + 'nsd': len(nsd) if nsd else 0, + 'vnfd': len(vnfd) if vnfd else 0, + 'ns': len(ns) if ns else 0, + 'vnf': len(vnf) if vnf else 0, + } + return render(request, 'osm/osm_project_details.html', {'project_overview': project_overview, 'project_id': project_id}) except Exception as e: @@ -145,7 +83,7 @@ def delete_project(request, project_id=None): if request.method == 'POST': try: - Project.objects.filter(id=project_id).delete() + ##TODO delete project return redirect('projects:projects_list') except Exception as e: print e @@ -153,13 +91,8 @@ def delete_project(request, project_id=None): elif request.method == 'GET': try: - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() - prj_token = project_overview['type'] - # example: 'etsi/etsi_project_delete.html' - print prj_token + '/' + prj_token + '_project_delete.html', project_overview['name'] - return render(request, prj_token + '/' + prj_token + '_project_delete.html', - {'project_id': project_id, 'project_name': project_overview['name']}) + return render(request, 'osm/osm_project_delete.html', + {'project_id': project_id, 'project_name': project_id}) except Exception as e: print e @@ -169,62 +102,49 @@ def delete_project(request, project_id=None): @login_required def show_descriptors(request, project_id=None, descriptor_type=None): csrf_token_value = get_token(request) - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() - prj_token = project_overview['type'] - url = prj_token + '/' + prj_token + '_project_descriptors.html' + client = Client() + try: + if descriptor_type == 'nsd': + descriptors = client.nsd_list() + + elif descriptor_type == 'vnfd': + descriptors = client.vnfd_list() + except Exception as e: + descriptors = [] + + url = 'osm/osm_project_descriptors.html' return __response_handler(request, { - 'descriptors': projects[0].get_descriptors(descriptor_type), + 'descriptors': descriptors, 'project_id': project_id, - 'project_type': prj_token, - 'project_overview_data': project_overview, + 'project_type': 'osm', "csrf_token_value": csrf_token_value, 'descriptor_type': descriptor_type },url) @login_required -def graph(request, project_id=None): - if request.method == 'GET': - csrf_token_value = get_token(request) - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() - prj_token = project_overview['type'] - # example : 'etsi/project_graph.html' - return render(request, prj_token + '/project_graph.html', { - 'project_id': project_id, - 'project_overview_data': projects[0].get_overview_data(), - 'collapsed_sidebar': False - }) - - -@login_required -def graph_data(request, project_id=None, descriptor_id=None): - print 'graph_data', project_id, descriptor_id - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() - # data = projects[0].get_overview_data() - prj_token = project_overview['type'] - - topology = projects[0].get_graph_data_json_topology(descriptor_id) - response = HttpResponse(topology, content_type="application/json") - response["Access-Control-Allow-Origin"] = "*" +def delete_descriptor(request, project_id=None, descriptor_type=None, descriptor_id=None): + csrf_token_value = get_token(request) - return response + try: + client = Client() + if descriptor_type == 'nsd': + result = client.nsd_delete(descriptor_id) + elif descriptor_type == 'vnfd': + result = client.vnfd_delete(descriptor_id) + else: + return False -@login_required -def delete_descriptor(request, project_id=None, descriptor_type=None, descriptor_id=None): - csrf_token_value = get_token(request) - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].delete_descriptor(descriptor_type, descriptor_id) - project_overview = projects[0].get_overview_data() + except Exception as e: + result = False + project_overview = OsmProject.get_overview_data() prj_token = project_overview['type'] page = prj_token + '/' + prj_token + '_project_descriptors.html' return render(request, page, { - 'descriptors': projects[0].get_descriptors(descriptor_type), + 'descriptors': OsmProject.get_descriptors(descriptor_type), 'project_id': project_id, 'project_overview_data': project_overview, "csrf_token_value": csrf_token_value, @@ -235,32 +155,10 @@ def delete_descriptor(request, project_id=None, descriptor_type=None, descriptor }) -@login_required -def clone_descriptor(request, project_id=None, descriptor_type=None, descriptor_id=None): - csrf_token_value = get_token(request) - projects = Project.objects.filter(id=project_id).select_subclasses() - new_id = request.GET.get('newid', '') - result = projects[0].clone_descriptor(descriptor_type, descriptor_id, new_id) - project_overview = projects[0].get_overview_data() - prj_token = project_overview['type'] - page = prj_token + '/' + prj_token + '_project_descriptors.html' - - return render(request, page, { - 'descriptors': projects[0].get_descriptors(descriptor_type), - 'project_id': project_id, - 'project_overview_data': project_overview, - "csrf_token_value": csrf_token_value, - 'descriptor_type': descriptor_type, - 'alert_message': { - 'success': result, - 'message': "Cloned!" if result else 'Error in cloning'} - }) - - @login_required def new_descriptor(request, project_id=None, descriptor_type=None): - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() + + project_overview = OsmProject.get_overview_data() prj_token = project_overview['type'] page = prj_token + '/descriptor/descriptor_new.html' if request.method == 'GET': @@ -280,17 +178,17 @@ def new_descriptor(request, project_id=None, descriptor_type=None): text = file_uploaded.read() data_type = file_uploaded.name.split(".")[-1] desc_name = file_uploaded.name.split(".")[0] - result = projects[0].create_descriptor(desc_name, descriptor_type, text, data_type, file_uploaded) + result = OsmProject.create_descriptor(desc_name, descriptor_type, text, data_type, file_uploaded) else: text = request.POST.get('text') desc_name = request.POST.get('id') - result = projects[0].create_descriptor(desc_name, descriptor_type, text, data_type) + result = OsmProject.create_descriptor(desc_name, descriptor_type, text, data_type) response_data = { 'project_id': project_id, 'descriptor_type': descriptor_type, - 'project_overview_data': projects[0].get_overview_data(), + 'project_overview_data':OsmProject.get_overview_data(), 'descriptor_id': result, 'alert_message': { 'success': True if result != False else False, @@ -306,8 +204,7 @@ def new_descriptor(request, project_id=None, descriptor_type=None): def edit_descriptor(request, project_id=None, descriptor_id=None, descriptor_type=None): if request.method == 'POST': print "edit_descriptor" - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].edit_descriptor(descriptor_type, descriptor_id, request.POST.get('text'), + result = OsmProject.edit_descriptor(descriptor_type, descriptor_id, request.POST.get('text'), request.POST.get('type')) response_data = { 'project_id': project_id, @@ -324,13 +221,12 @@ def edit_descriptor(request, project_id=None, descriptor_id=None, descriptor_typ elif request.method == 'GET': csrf_token_value = get_token(request) - projects = Project.objects.filter(id=project_id).select_subclasses() - project_overview = projects[0].get_overview_data() + project_overview = OsmProject.get_overview_data() print project_overview prj_token = project_overview['type'] page = prj_token + '/descriptor/descriptor_view.html' - descriptor = projects[0].get_descriptor(descriptor_id, descriptor_type) + descriptor = OsmProject.get_descriptor(descriptor_id, descriptor_type) descriptor_string_json = json.dumps(descriptor) descriptor_string_yaml = Util.json2yaml(descriptor) @@ -338,130 +234,12 @@ def edit_descriptor(request, project_id=None, descriptor_id=None, descriptor_typ return render(request, page, { 'project_id': project_id, 'descriptor_id': descriptor_id, - 'project_overview_data': projects[0].get_overview_data(), + 'project_overview_data': OsmProject.get_overview_data(), 'descriptor_type': descriptor_type, 'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml, 'descriptor_string_json': descriptor_string_json}}) -@login_required -def graph_positions(request, project_id=None): - if request.method == 'POST': - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].edit_graph_positions(json.loads(request.POST.get('positions'))) - status_code = 200 if result else 500 - response = HttpResponse(json.dumps({}), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - - -@login_required -def add_element(request, project_id=None): - if request.method == 'POST': - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].get_add_element(request) - - status_code = 200 if result else 500 - response = HttpResponse(json.dumps({}), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - - -@login_required -def remove_element(request, project_id=None): - if request.method == 'POST': - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].get_remove_element(request) - - status_code = 200 if result else 500 - response = HttpResponse(json.dumps({}), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - - -@login_required -def add_link(request, project_id=None): - if request.method == 'POST': - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].get_add_link(request) - - status_code = 200 if result else 500 - response = HttpResponse(json.dumps({}), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - - -@login_required -def remove_link(request, project_id=None): - if request.method == 'POST': - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].get_remove_link(request) - - status_code = 200 if result else 500 - response = HttpResponse(json.dumps({}), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - -@login_required -def get_available_nodes(request, project_id=None): - if request.method == 'GET': - csrf_token_value = get_token(request) - projects = Project.objects.filter(id=project_id).select_subclasses() - print "get_available_nodes", request.GET.dict() - result = projects[0].get_available_nodes(request.GET.dict()) - status_code = 500 if result == None else 200 - print json.dumps(result) - response = HttpResponse(json.dumps(result), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - -@login_required -def overviewelement(request, project_id=None): - if request.method == 'GET': - result = {} - error_msg = None - try: - projects = Project.objects.filter(id=project_id).select_subclasses() - project = projects[0] - parameters = request.GET.dict() - print "parameters", parameters - result = project.get_node_overview(**parameters) - except Exception as e: - error_msg = str(e) - - if error_msg is not None: - return JsonResponse({'error': {'error_msg': str(error_msg)}}) - - return JsonResponse({'node_overview': result}) - -# ETSI specific method # -@login_required -def add_node_to_vnffg(request, project_id=None): - print "add_node_to_vnffg" # TODO log - if request.method == 'POST': - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].add_node_to_vnffg(request) - - status_code = 200 if result else 500 - response = HttpResponse(json.dumps({}), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - - -@login_required -def unused_vnf(request, project_id=None, nsd_id=None): - if request.method == 'GET': - print 'in method unused_vnf : ', project_id, nsd_id # TODO log - projects = Project.objects.filter(id=project_id).select_subclasses() - result = projects[0].get_unused_vnf(nsd_id) - status_code = 500 if result == None else 200 - response = HttpResponse(json.dumps(result), content_type="application/json", status=status_code) - response["Access-Control-Allow-Origin"] = "*" - return response - -# end ETSI specific method # - - # OSM specific method # def get_package_files_list(request, project_id, project, descriptor_id, descriptor_type): files_list = [] @@ -475,8 +253,8 @@ def get_package_files_list(request, project_id, project, descriptor_id, descript return __response_handler(request, result) -def download_pkg(request, project_id, project, descriptor_id, descriptor_type): - tar_pkg = project.download_pkg(project, descriptor_id, descriptor_type) +def download_pkg(request, project_id, descriptor_id, descriptor_type): + tar_pkg = OsmProject.download_pkg(descriptor_id, descriptor_type) response = HttpResponse(content_type="application/tgz") response["Content-Disposition"] = "attachment; filename=osm_export.tar.gz" @@ -511,9 +289,8 @@ def create_ns(request, project_id, project, descriptor_id, descriptor_type): @login_required def custom_action(request, project_id=None, descriptor_id=None, descriptor_type=None, action_name=None): if request.method == 'GET': - projects = Project.objects.filter(id=project_id).select_subclasses() print "Custom action: " + action_name - return globals()[action_name](request, project_id, projects[0], descriptor_id, descriptor_type) + return globals()[action_name](request, project_id, descriptor_id, descriptor_type) def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs): diff --git a/sf_t3d/settings.py b/sf_t3d/settings.py index 658bafd..36de1b6 100644 --- a/sf_t3d/settings.py +++ b/sf_t3d/settings.py @@ -27,7 +27,7 @@ DEBUG = True ALLOWED_HOSTS = [] -AUTH_USER_MODEL = "sf_user.CustomUser" +AUTH_USER_MODEL = "authosm.OsmUser" SITE_NAME = "Open Source MANO" SHORT_SITE_NAME = "OSM" @@ -46,10 +46,12 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'sf_user', + 'authosm', 'projecthandler', 'vimhandler', 'instancehandler', - 'sdnctrlhandler' + 'sdnctrlhandler', + ] MIDDLEWARE_CLASSES = [ @@ -113,6 +115,8 @@ DATABASES = { } } +AUTHENTICATION_BACKENDS = ['authosm.backend.OsmBackend'] + # Password validation # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators diff --git a/sf_t3d/urls.py b/sf_t3d/urls.py index 5b82f5a..a213202 100644 --- a/sf_t3d/urls.py +++ b/sf_t3d/urls.py @@ -15,19 +15,17 @@ Including another URLconf 3. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) """ from django.conf.urls import url, include -from django.contrib import admin from sf_user import views as user_views +from authosm import views as user_views from sf_t3d import views app_name = 'base' urlpatterns = [ - url(r'^admin/', admin.site.urls), - url(r'^auth/$', user_views.login_view, name='auth_user'), - url(r'^auth_guest/$', user_views.guest_login, name='auth_user_guest'), - url(r'^register', user_views.register_view, name='register_user'), + #url(r'^admin/', admin.site.urls), + url(r'^auth/$', user_views.user_login, name='auth_user'), + #url(r'^auth_guest/$', user_views.guest_login, name='auth_user_guest'), + #url(r'^register', user_views.register_view, name='register_user'), url(r'^projects/', include('projecthandler.urls.project', namespace='projects'), name='projects_base'), - #url(r'^vims/', include('vimhandler.urls', namespace='vim'), name='vims_base'), - #url(r'^sdn/', include('sdnctrlhandler.urls', namespace='sdn'), name='sdns_base'), url(r'^$', views.home, name='home'), url(r'^home', views.home, name='home'), diff --git a/sf_t3d/views.py b/sf_t3d/views.py index 91590f0..810373f 100644 --- a/sf_t3d/views.py +++ b/sf_t3d/views.py @@ -1,18 +1,20 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required from projecthandler.models import Project -from sf_user.models import CustomUser +from authosm.models import OsmUser @login_required def home(request): - user = CustomUser.objects.get(id=request.user.id) + user = OsmUser.objects.get(id=request.user.id) + projects = Project.objects.filter(owner=user).select_subclasses() result = { 'projects': len(projects) if projects else 0, } - return render(request, 'home.html', result) + return redirect('projects:open_project', project_id='admin') + #return render(request, 'home.html', result) def forbidden(request): diff --git a/template/base.html b/template/base.html index 60576d1..0932c59 100644 --- a/template/base.html +++ b/template/base.html @@ -48,19 +48,19 @@
    +
    + + +
    -- 2.17.1