Merge remote branch 'origin/master' into wosch

diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 96f04b2..6e5d7bb 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -50,7 +50,7 @@
     var jasmine_config = {
       search_query: "netbsd",
       expected_hits: 10,
-      active_clients: 16,
+      active_clients: 17,
       show_record_url: true
     };
 

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 53a65fc..a76c65c 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -267,15 +267,17 @@ function team($, teamName) {
        if (query) m_query = query;
        if (sortOrder) m_sortOrder = sortOrder;
        if (perpage) m_perpage = perpage;
-       if (targets) m_filterSet.add(targetFilter(id, id));
+       if (targets) m_filterSet.add(targetFilter(targets, targets));
 
        var pp2filter = m_filterSet.pp2filter();
        var pp2limit = m_filterSet.pp2limit(limit);
         var pp2catLimit = m_filterSet.pp2catLimit();
+       if (pp2catLimit) {
+            pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+        }
 
        var params = {};
        if (pp2limit) params.limit = pp2limit;
-       if (pp2catLimit) params.categoryfilter = pp2catLimit;
        if (maxrecs) params.maxrecs = maxrecs;
        if (torusquery) {
            if (!mkws.config.use_service_proxy)
@@ -418,7 +420,10 @@ function team($, teamName) {
        });
 
        // on first page, hide the termlist
-       $(document).ready(function() { widgetNode("Termlists").hide(); });
+       $(document).ready(function() {
+            var t = widgetNode("Termlists");
+            if (t) t.hide();
+        });
         var container = findnode(".mkwsMOTDContainer");
        if (container.length) {
            // Move the MOTD from the provided element down into the container

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 4b3117e..de82dfe 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -28,7 +28,7 @@ function init_jasmine_config() {
 
     var jasmine_config_default = {
         search_query: "freebsd",
-        max_time: 16,
+        max_time: 17,
         // in seconds
         expected_hits: 80,
         // at least expected hit counter