switch de publico

parent b6275e13
...@@ -19,14 +19,7 @@ class AuthRequiredMiddleware(object): ...@@ -19,14 +19,7 @@ class AuthRequiredMiddleware(object):
#if "/reports/" in request.path_info and "/scl_data" in request.path_info and purchase: #if "/reports/" in request.path_info and "/scl_data" in request.path_info and purchase:
if "/reports/" in request.path_info and "/scl_data" in request.path_info: if "/reports/" in request.path_info and "/scl_data" in request.path_info:
pass
purchase_id = request.path_info.replace("/reports/", "")
purchase_id = purchase_id.replace("/scl_data", "")
purchase = Purchase.objects.filter(pk=purchase_id, is_public=True)
if purchase:
print ("si")
else:
return HttpResponseRedirect(reverse('login'))
elif request.path_info == reverse('ipn'): elif request.path_info == reverse('ipn'):
print(request.path_info) print(request.path_info)
elif not request.user.is_authenticated and request.path_info != reverse('login') and not request.user.is_active: elif not request.user.is_authenticated and request.path_info != reverse('login') and not request.user.is_active:
......
...@@ -9,10 +9,12 @@ from collections import OrderedDict ...@@ -9,10 +9,12 @@ from collections import OrderedDict
from datetime import datetime from datetime import datetime
from django.http import HttpResponse, Http404, JsonResponse from django.http import HttpResponse, Http404, JsonResponse
from django.shortcuts import render from django.shortcuts import render, redirect
from reportlab.lib.pagesizes import letter from reportlab.lib.pagesizes import letter
from reportlab.pdfgen import canvas from reportlab.pdfgen import canvas
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from GeoInt_SIDT.settings import BASE_URL
from catalog.models import Purchase from catalog.models import Purchase
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
...@@ -29,10 +31,13 @@ USERS_PATH = config['PATHS']['PATH_USERS'] ...@@ -29,10 +31,13 @@ USERS_PATH = config['PATHS']['PATH_USERS']
########################################################### ###########################################################
def report_L2ASCL(request, report, purchase_id): def report_L2ASCL(request, report, purchase_id):
purchase = Purchase.objects.filter(pk=purchase_id, is_public=True)
if not request.user.is_authenticated: if not request.user.is_authenticated and purchase:
email = "user@algo.com" email = "user@algo.com"
print (email) print (email)
elif not request.user.is_authenticated and not purchase:
return redirect('../../../')
else: else:
email = request.user.email email = request.user.email
...@@ -51,7 +56,7 @@ def report_L2ASCL(request, report, purchase_id): ...@@ -51,7 +56,7 @@ def report_L2ASCL(request, report, purchase_id):
#print(datasets) #print(datasets)
if report == 'scl_data': if report == 'scl_data':
template = "sclData.html" template = "sclData.html"
reporteDir='mask' reporteDir='mask'
folders="" folders=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment