From 5f30cf7574c516b97075a6f9323ab24512ca9c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 1 Apr 2011 11:04:55 +0000
Subject: [PATCH] fix casing bug with entityid
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2787 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discojuice/lib/Feed.php | 4 +---
.../discojuice/www/discojuice/discojuice.control.js | 5 ++++-
modules/discojuice/www/discojuice/discojuice.ui.js | 13 ++-----------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/modules/discojuice/lib/Feed.php b/modules/discojuice/lib/Feed.php
index e80988e86..0442add2e 100644
--- a/modules/discojuice/lib/Feed.php
+++ b/modules/discojuice/lib/Feed.php
@@ -111,8 +111,6 @@ class sspmod_discojuice_Feed {
if ($this->exclude($m['entityid'])) continue;
$this->feed[] = $this->processEntity($m);
-
-
}
if (!empty($this->insert)) {
@@ -125,7 +123,7 @@ class sspmod_discojuice_Feed {
private function processEntity($m) {
- $data = array('entityID' => $m['entityID']);
+ $data = array('entityID' => $m['entityid']);
$this->getCountry($data, $m);
$this->getTitle($data, $m);
diff --git a/modules/discojuice/www/discojuice/discojuice.control.js b/modules/discojuice/www/discojuice/discojuice.control.js
index b58f65564..0016c7183 100644
--- a/modules/discojuice/www/discojuice/discojuice.control.js
+++ b/modules/discojuice/www/discojuice/discojuice.control.js
@@ -262,7 +262,10 @@ DiscoJuice.Control = {
},
- "selectProvider": function(entityID) {
+ "selectProvider": function(entityID) {
+
+ console.log('entityid: ' + entityID);
+
var callback;
var that = this;
var mustwait = that.discoWrite(entityID);
diff --git a/modules/discojuice/www/discojuice/discojuice.ui.js b/modules/discojuice/www/discojuice/discojuice.ui.js
index 2b3d02792..52fe6e53b 100644
--- a/modules/discojuice/www/discojuice/discojuice.ui.js
+++ b/modules/discojuice/www/discojuice/discojuice.ui.js
@@ -8,9 +8,6 @@
if (typeof DiscoJuice == "undefined") var DiscoJuice = {};
-
-
-
DiscoJuice.UI = {
// Reference to the top level DiscoJuice object
"parent" : DiscoJuice,
@@ -58,13 +55,6 @@ DiscoJuice.UI = {
var debugweight = this.parent.Utils.options.get('debug.weight', false);
-// console.log('Dump item');
-// console.log(item);
-// console.log(countrydef);
-// console.log(search);
-// console.log(distance);
-
-
// Add icon element first
if (item.icon) {
@@ -103,7 +93,6 @@ DiscoJuice.UI = {
}
textLink += '</span>';
-// clear = true;
}
if (debugweight) {
@@ -134,6 +123,8 @@ DiscoJuice.UI = {
textLink += '<hr style="clear: both; height: 0px; visibility:hidden" />';
}
+ console.log(item);
+
// Wrap in A element
textLink = '<a href="" class="' + classes + '" rel="' + escape(item.entityID) + '" title="' + escape(item.title) + '">' +
textLink + '</a>';
--
GitLab