switch de publico

catalog/middleware.py

@@ -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:
-
-            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'))
+            pass
         elif request.path_info == reverse('ipn'):
             print(request.path_info)
         elif not request.user.is_authenticated and request.path_info != reverse('login') and not request.user.is_active:

reports/views.py

@@ -9,10 +9,12 @@ from collections import OrderedDict
 
 from datetime import datetime
 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.pdfgen import canvas
 from django.views.decorators.csrf import csrf_exempt
+
+from GeoInt_SIDT.settings import BASE_URL
 from catalog.models import Purchase
 
 # -------------------------------------------------------------------------------
@@ -29,10 +31,13 @@ USERS_PATH = config['PATHS']['PATH_USERS']
 
 ###########################################################
 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"
         print (email)
+    elif not request.user.is_authenticated and not purchase:
+        return redirect('../../../')
     else:
         email = request.user.email
 
@@ -51,7 +56,7 @@ def report_L2ASCL(request, report, purchase_id):
     #print(datasets)
 
     if report == 'scl_data':
- 
+
         template = "sclData.html"
         reporteDir='mask'
         folders=""