From 67486abb59276c2cc0b93ba302a60430a96a5695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 20 May 2011 10:51:11 +0000
Subject: [PATCH] The DiscoJuice AJAX request for metadata now contains the
entityID of the service
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2841 44740490-163a-0410-bde0-09ae8108e29a
---
.../discojuice/www/discojuice/discojuice.control.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/modules/discojuice/www/discojuice/discojuice.control.js b/modules/discojuice/www/discojuice/discojuice.control.js
index 44c203fa2..4ec500c49 100644
--- a/modules/discojuice/www/discojuice/discojuice.control.js
+++ b/modules/discojuice/www/discojuice/discojuice.control.js
@@ -34,11 +34,19 @@ DiscoJuice.Control = {
var that = this;
if (this.data) return;
var metadataurl = this.parent.Utils.options.get('metadata');
+ var parameters = {};
this.parent.Utils.log('metadataurl is ' + metadataurl);
if (!metadataurl) return;
+
+ // If SP EntityID is set in configuration make sure it is sent as a parameter
+ // to the feed endpoint.
+ var discosettings = this.parent.Utils.options.get('disco');
+ if (discosettings) {
+ parameters.entityID = discosettings.spentityid;
+ }
- $.getJSON(metadataurl, function(data) {
+ $.getJSON(metadataurl, parameters, function(data) {
that.data = data;
that.parent.Utils.log('Successfully loaded metadata (' + data.length + ')');
that.postLoad();
@@ -508,6 +516,8 @@ DiscoJuice.Control = {
iframeurl = writableStore + '?entityID=' + escape(spentityid) + '&IdPentityID=' +
escape(entityID) + '&isPassive=true&returnIDParam=bogus&return=' + escape(returnurl);
+ this.parent.Utils.log('DiscoJuice.Control discoWrite iframeURL (' + iframeurl + ') ');
+
html = '<iframe src="' + iframeurl + '" style="display: none"></iframe>';
this.ui.addContent(html);
return true;
--
GitLab