--- a/server/src/metaeducation/middleware.py Tue Oct 04 14:59:01 2016 +0200
+++ b/server/src/metaeducation/middleware.py Wed Oct 05 12:10:46 2016 +0200
@@ -16,8 +16,6 @@
Middleware intended to emulate login_required decorator so we can forward the context query arg
"""
def process_request(self, request):
- logger.debug("REQUEST: %r ", request.user)
- logger.debug("REQUEST: Session - %r", request.session.get("OAUTH_CONTEXT_BASE_URL", "No OAuth Context in session"))
cached_user = getattr(request, "_cached_user", "None")
logger.debug("REQUEST: Cached user - %r", cached_user)
if not request.user.is_authenticated():
--- a/server/src/metaeducation/signals.py Tue Oct 04 14:59:01 2016 +0200
+++ b/server/src/metaeducation/signals.py Wed Oct 05 12:10:46 2016 +0200
@@ -13,10 +13,10 @@
def reference_created_renkan(sender, instance, created, **kwargs):
- from renkanmanager.models import Renkan
+ from renkanmanager.models import Revision
if not settings.MTDC_CLIENT_CREDENTIALS_TOKEN_URL or not settings.MTDC_REFERENCE_RESOURCE_BASE_URL:
return
- if created and sender == Renkan and not instance.source_revision_id:
+ if created and sender == Revision and not instance.parent_renkan.source_revision_id and instance.parent_renkan.revision_count <= 1:
token_response = requests.post(
settings.MTDC_CLIENT_CREDENTIALS_TOKEN_URL+"?grant_type=client_credentials",
data = {},
@@ -28,7 +28,7 @@
logger.debug("REFERENCING RENKAN: token response is 200")
token = json.loads(token_response.text)['access_token']
post_data = json.dumps({
- "id": str(instance.renkan_guid),
+ "id": str(instance.parent_renkan.renkan_guid),
"idOutil": settings.RENKAN_TOOL_ID,
"idUser": instance.creator.external_id,
"pf": settings.ITOP_PF_CODE,