diff --git a/languages/de.ini b/languages/de.ini
index 69bfd11d6d71d49b934bb2d71fa3d6a423d1b9bf..da2b8ab160a87771897c41295bfa087249eb15ab 100644
--- a/languages/de.ini
+++ b/languages/de.ini
@@ -135,7 +135,7 @@ browse_lcc = "LC-Klassifikation"
browse_publishDate = "Erscheinungsjahr"
browse_title = "Titel"
browse_topic = "Thema"
-bulk_email_success = "Ihre Auswahl wurde per E-Mail verschickt."
+bulk_email_success = "Ihre Auswahl wurde per E-Mail verschickt"
bulk_email_title = "Referenzen aus dem Bibliothekskatalog"
bulk_error_missing = "Fehlende Angaben. Ihre Anfrage ist fehlgeschlagen."
bulk_export_not_supported = "Die markierten Einträge können nicht für Massenexporte verwendet werden."
@@ -360,7 +360,7 @@ fav_delete_deleting = "Ihre ausgewählten Favoriten werden gelöscht."
fav_delete_fail = "Leider ist ein Fehler aufgetreten. Ihre ausgewählten Favoriten wurden nicht gelöscht."
fav_delete_missing = "Fehlende Angaben. Ihre ausgewählten Favoriten wurden nicht gelöscht."
fav_delete_success = "Ihre ausgewählten Favoriten wurden gelöscht."
-fav_delete_warn = "Sie sind dabei diese Favoriten aus all Ihren Listen zu löschen. Falls Sie Favoriten nur aus einer einzelnen Liste löschen möchten, wählen Sie bitte die betreffende Liste aus, bevor Sie auf Löschen klicken."
+fav_delete_warn = "Sie sind dabei, diese Favoriten aus all Ihren Listen zu löschen - Falls Sie Favoriten nur aus einer einzelnen Liste löschen möchten, wählen Sie bitte die betreffende Liste aus, bevor Sie auf Löschen klicken."
fav_email_fail = "Leider ist ein Fehler aufgetreten. Ihre ausgewählten Favoriten wurden nicht per E-Mail versendet."
fav_email_missing = "Fehlende Angaben. Ihre ausgewählten Favoriten wurden nicht per E-Mail versendet."
fav_email_success = "Ihre ausgewählten Favoriten wurden erfolgreich per E-Mail versendet."
@@ -578,7 +578,6 @@ List = "Liste"
List Tags = "Tags auflisten"
list_access_denied = "Sie sind nicht berechtigt diese Liste anzusehen."
list_edit_name_required = "Name für die Liste fehlt!"
-list_item_delete = "Eintrag aus der Liste löschen"
load_tag_error = "Fehler: Laden der Tags fehlgeschlagen"
Loading = "Wird geladen"
Local Login = "Lokale Anmeldung"
diff --git a/module/VuFind/src/VuFind/Auth/ILS.php b/module/VuFind/src/VuFind/Auth/ILS.php
index a36db29c27de381c8074ea93d9289686599011cc..95671c9ce8d7ec20d83fcfe07af89575263e7341 100644
--- a/module/VuFind/src/VuFind/Auth/ILS.php
+++ b/module/VuFind/src/VuFind/Auth/ILS.php
@@ -202,7 +202,8 @@ class ILS extends AbstractBase
}
// Update the user and send it back to the caller:
- $user = $this->getUserTable()->getByUsername($patron['cat_username']);
+ $username = $patron[$this->getUsernameField()];
+ $user = $this->getUserTable()->getByUsername($username);
$user->saveCredentials($patron['cat_username'], $params['password']);
return $user;
}
@@ -219,9 +220,7 @@ class ILS extends AbstractBase
{
// Figure out which field of the response to use as an identifier; fail
// if the expected field is missing or empty:
- $config = $this->getConfig();
- $usernameField = isset($config->Authentication->ILS_username_field)
- ? $config->Authentication->ILS_username_field : 'cat_username';
+ $usernameField = $this->getUsernameField();
if (!isset($info[$usernameField]) || empty($info[$usernameField])) {
throw new AuthException('authentication_error_technical');
}
@@ -289,4 +288,16 @@ class ILS extends AbstractBase
$patron = $this->authenticator->storedCatalogLogin();
return $patron ? $patron : null;
}
+
+ /**
+ * Gets the configured username field.
+ *
+ * @return string
+ */
+ protected function getUsernameField()
+ {
+ $config = $this->getConfig();
+ return isset($config->Authentication->ILS_username_field)
+ ? $config->Authentication->ILS_username_field : 'cat_username';
+ }
}
diff --git a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
index 147f1a2cd10848cf3784445c4f657951e90f3ce4..1a907fb3e27e257b6e27c0e0ec92c13a453b13da 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
@@ -1787,7 +1787,7 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
$profile = [
'id' => $this->getField($idObj->{'id'}),
'firstname' => $this->getField($rsp->{'firstname'}),
- 'lastname' => $this->getField($rsp->{'lastname'}),
+ 'lastname' => $this->getField($rsp->{'surname'}),
'cat_username' => $username,
'cat_password' => $password,
'email' => $this->getField($rsp->{'email'}),
diff --git a/module/VuFind/src/VuFind/Search/QueryAdapter.php b/module/VuFind/src/VuFind/Search/QueryAdapter.php
index 689750136fece992c3f506d3e14bc0264114f86e..2fb6b089af082309fe652b32a51fb5b614186d6d 100644
--- a/module/VuFind/src/VuFind/Search/QueryAdapter.php
+++ b/module/VuFind/src/VuFind/Search/QueryAdapter.php
@@ -248,6 +248,13 @@ abstract class QueryAdapter
'b' => $operator
];
if (null !== ($op = $current->getOperator())) {
+ // Some search forms omit the operator for the first element;
+ // if we have an operator in a subsequent element, we should
+ // backfill a blank here for consistency; otherwise, VuFind
+ // may not construct correct search URLs.
+ if (isset($retVal[0]['f']) && !isset($retVal[0]['o'])) {
+ $retVal[0]['o'] = '';
+ }
$currentArr['o'] = $op;
}
$retVal[] = $currentArr;
diff --git a/module/VuFind/tests/fixtures/searches/operators b/module/VuFind/tests/fixtures/searches/operators
new file mode 100644
index 0000000000000000000000000000000000000000..f6c06e3ddfa1599112b278bda9d61796d1a49f8f
Binary files /dev/null and b/module/VuFind/tests/fixtures/searches/operators differ
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ILSTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ILSTest.php
index 4e5282a65a6a22892b0726f36d1fb32fa0245a3c..f00c990391c67588340e6af37ad8c1c45868d57b 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ILSTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ILSTest.php
@@ -26,7 +26,10 @@
* @link https://vufind.org Main Page
*/
namespace VuFindTest\Auth;
-use VuFind\Auth\ILS, VuFind\Db\Table\User;
+
+use VuFind\Auth\ILS;
+use VuFind\Db\Table\User;
+use Zend\Stdlib\Parameters;
/**
* ILS authentication test class.
@@ -41,20 +44,6 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
{
use \VuFindTest\Unit\UserCreationTrait;
- /**
- * Object to test
- *
- * @var ILS
- */
- protected $auth;
-
- /**
- * Mock ILS driver
- *
- * @var \VuFind\ILS\Driver\Sample
- */
- protected $driver;
-
/**
* Standard setup method.
*
@@ -76,23 +65,56 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
if (!$this->continuousIntegrationRunning()) {
return $this->markTestSkipped('Continuous integration not running.');
}
- $this->driver = $this->createMock('VuFind\ILS\Driver\Sample');
+ }
+
+ /**
+ * Get a mock ILS driver to test.
+ *
+ * @param string $type Driver type to mock (default = Sample)
+ * @param array $methods Methods to mock
+ *
+ * @return \VuFind\ILS\Driver\Sample
+ */
+ protected function getMockDriver($type = 'Sample', $methods = [])
+ {
+ return $this->getMockBuilder('VuFind\ILS\Driver\\' . $type)
+ ->disableOriginalConstructor()
+ ->setMethods($methods)
+ ->getMock();
+ }
+
+ /**
+ * Get the object to test.
+ *
+ * @param \VuFind\ILS\Driver\AbstractBase $driver Mock ILS driver to test with.
+ * @param array $patron Logged in patron for mock
+ * authenticator (null for none)
+ *
+ * @return \VuFind\Auth\ILS
+ */
+ protected function getAuth($driver = null, $patron = null)
+ {
+ if (empty($driver)) {
+ $driver = $this->getMockDriver();
+ }
+ $authenticator = $this->getMockILSAuthenticator($patron);
$driverManager = new \VuFind\ILS\Driver\PluginManager();
- $driverManager->setService('Sample', $this->driver);
+ $driverManager->setService('Sample', $driver);
$mockConfigReader = $this->createMock('VuFind\Config\PluginManager');
$mockConfigReader->expects($this->any())->method('get')
->will($this->returnValue(new \Zend\Config\Config([])));
- $this->auth = new \VuFind\Auth\ILS(
+ $auth = new \VuFind\Auth\ILS(
new \VuFind\ILS\Connection(
new \Zend\Config\Config(['driver' => 'Sample']),
$driverManager, $mockConfigReader
),
- $this->getMockILSAuthenticator()
+ $authenticator
);
- $this->auth->setDbTableManager(
+ $auth->setDbTableManager(
$this->getServiceManager()->get('VuFind\DbTablePluginManager')
);
- $this->auth->getCatalog()->setDriver($this->driver);
+ $auth->getCatalog()->setDriver($driver);
+ return $auth;
}
/**
@@ -102,7 +124,7 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
*/
public function testCreateIsDisallowed()
{
- $this->assertFalse($this->auth->supportsCreation());
+ $this->assertFalse($this->getAuth()->supportsCreation());
}
/**
@@ -132,7 +154,7 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
{
$this->setExpectedException('VuFind\Exception\Auth');
$request = $this->getLoginRequest(['username' => '']);
- $this->auth->authenticate($request);
+ $this->getAuth()->authenticate($request);
}
/**
@@ -144,7 +166,7 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
{
$this->setExpectedException('VuFind\Exception\Auth');
$request = $this->getLoginRequest(['password' => '']);
- $this->auth->authenticate($request);
+ $this->getAuth()->authenticate($request);
}
/**
@@ -157,11 +179,12 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
// VuFind requires the ILS driver to return a value in cat_username
// by default -- if that is missing, we should fail.
$response = [];
- $this->driver->expects($this->once())->method('patronLogin')
+ $driver = $this->getMockDriver();
+ $driver->expects($this->once())->method('patronLogin')
->with($this->equalTo('testuser'), $this->equalTo('testpass'))
->will($this->returnValue($response));
$this->setExpectedException('VuFind\Exception\Auth');
- $this->auth->authenticate($this->getLoginRequest());
+ $this->getAuth($driver)->authenticate($this->getLoginRequest());
}
/**
@@ -175,14 +198,152 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
'cat_username' => 'testuser', 'cat_password' => 'testpass',
'email' => 'user@test.com'
];
- $this->driver->expects($this->once())->method('patronLogin')
+ $driver = $this->getMockDriver();
+ $driver->expects($this->once())->method('patronLogin')
->with($this->equalTo('testuser'), $this->equalTo('testpass'))
->will($this->returnValue($response));
- $user = $this->auth->authenticate($this->getLoginRequest());
+ $user = $this->getAuth($driver)->authenticate($this->getLoginRequest());
$this->assertEquals('testuser', $user->username);
$this->assertEquals('user@test.com', $user->email);
}
+ /**
+ * Test failure caused by missing cat_id.
+ *
+ * @return void
+ *
+ * @expectedException VuFind\Exception\Auth
+ * @expectedExceptionMessage authentication_error_technical
+ */
+ public function testLoginWithMissingCatId()
+ {
+ $response = [
+ 'cat_username' => 'testuser', 'cat_password' => 'testpass',
+ 'email' => 'user@test.com'
+ ];
+ $driver = $this->getMockDriver();
+ $driver->expects($this->once())->method('patronLogin')
+ ->with($this->equalTo('testuser'), $this->equalTo('testpass'))
+ ->will($this->returnValue($response));
+ $auth = $this->getAuth($driver);
+ // Configure the authenticator to look for a cat_id; since there is no
+ // cat_id in the response above, this will throw an exception.
+ $config = ['Authentication' => ['ILS_username_field' => 'cat_id']];
+ $auth->setConfig(new \Zend\Config\Config($config));
+ $auth->authenticate($this->getLoginRequest());
+ }
+
+ /**
+ * Test updating a user's password with mismatched new password values.
+ *
+ * @return void
+ *
+ * @expectedException VuFind\Exception\Auth
+ * @expectedExceptionMessage Password cannot be blank
+ */
+ public function testUpdateUserPasswordWithEmptyValue()
+ {
+ $patron = ['cat_username' => 'testuser'];
+ $request = $this->getLoginRequest(
+ [
+ 'oldpwd' => 'foo',
+ 'password' => '',
+ 'password2' => '',
+ ]
+ );
+ $this->getAuth(null, $patron)->updatePassword($request);
+ }
+
+ /**
+ * Test updating a user's password with mismatched new password values.
+ *
+ * @return void
+ *
+ * @expectedException VuFind\Exception\Auth
+ * @expectedExceptionMessage authentication_error_technical
+ */
+ public function testUpdateUserPasswordWithoutLoggedInUser()
+ {
+ $request = $this->getLoginRequest(
+ [
+ 'oldpwd' => 'foo',
+ 'password' => 'bar',
+ 'password2' => 'bar',
+ ]
+ );
+ $this->getAuth()->updatePassword($request);
+ }
+
+ /**
+ * Test updating a user's password with mismatched new password values.
+ *
+ * @return void
+ *
+ * @expectedException VuFind\Exception\Auth
+ * @expectedExceptionMessage Passwords do not match
+ */
+ public function testUpdateUserPasswordWithMismatch()
+ {
+ $request = $this->getLoginRequest(
+ [
+ 'oldpwd' => 'foo',
+ 'password' => 'pass',
+ 'password2' => 'fail',
+ ]
+ );
+ $patron = ['cat_username' => 'testuser'];
+ $this->getAuth(null, $patron)->updatePassword($request);
+ }
+
+ /**
+ * Test updating a user's password.
+ *
+ * @return void
+ */
+ public function testUpdateUserPassword()
+ {
+ $request = $this->getLoginRequest(
+ [
+ 'oldpwd' => 'foo',
+ 'password' => 'newpass',
+ 'password2' => 'newpass',
+ ]
+ );
+ $driver = $this->getMockDriver('Demo', ['changePassword']);
+ $driver->expects($this->once())->method('changePassword')
+ ->will($this->returnValue(['success' => true]));
+ $patron = ['cat_username' => 'testuser'];
+ $user = $this->getAuth($driver, $patron)->updatePassword($request);
+ $this->assertEquals('testuser', $user->username);
+ $this->assertEquals('newpass', $user->getCatPassword());
+ }
+
+ /**
+ * Test updating a user's password (identifying user with cat_id field).
+ *
+ * @return void
+ */
+ public function testUpdateUserPasswordUsingCatIdField()
+ {
+ $request = $this->getLoginRequest(
+ [
+ 'oldpwd' => 'foo',
+ 'password' => 'newpass',
+ 'password2' => 'newpass',
+ ]
+ );
+ $driver = $this->getMockDriver('Demo', ['changePassword']);
+ $driver->expects($this->once())->method('changePassword')
+ ->will($this->returnValue(['success' => true]));
+ $patron = ['cat_username' => 'testuser', 'cat_id' => '1234'];
+ $auth = $this->getAuth($driver, $patron);
+ $config = ['Authentication' => ['ILS_username_field' => 'cat_id']];
+ $auth->setConfig(new \Zend\Config\Config($config));
+ $user = $auth->updatePassword($request);
+ $this->assertEquals('1234', $user->username);
+ $this->assertEquals('newpass', $user->getCatPassword());
+ }
+
/**
* Standard teardown method.
*
@@ -190,18 +351,24 @@ class ILSTest extends \VuFindTest\Unit\DbTestCase
*/
public static function tearDownAfterClass()
{
- static::removeUsers('testuser');
+ static::removeUsers(['1234', 'testuser']);
}
/**
* Get mock ILS authenticator
*
+ * @param array $patron Logged in patron to simulate (null for none).
+ *
* @return \VuFind\Auth\ILSAuthenticator
*/
- protected function getMockILSAuthenticator()
+ protected function getMockILSAuthenticator($patron = null)
{
- return $this->getMockBuilder('VuFind\Auth\ILSAuthenticator')
+ $mock = $this->getMockBuilder('VuFind\Auth\ILSAuthenticator')
->disableOriginalConstructor()
+ ->setMethods(['storedCatalogLogin'])
->getMock();
+ $mock->expects($this->any())->method('storedCatalogLogin')
+ ->will($this->returnValue($patron));
+ return $mock;
}
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php
index 9ab9c5e3c92b54618a6b34ff5312907a83bf19ba..238a939f3493d8fc3ccdc308cb3f22585a0dee45 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/QueryAdapterTest.php
@@ -65,6 +65,36 @@ class QueryAdapterTest extends TestCase
}
}
+ /**
+ * Test that when one part of the query contains an operator, ALL parts of the
+ * query contain an operator. (We want to be sure that in cases where the first
+ * part of the query has no operator associated with it, a blank value is filled
+ * in as a placeholder.
+ *
+ * @return void
+ */
+ public function testOperatorDefinedEverywhere()
+ {
+ $fixturePath = realpath(__DIR__ . '/../../../../fixtures/searches') . '/';
+ $q = unserialize(file_get_contents($fixturePath . '/operators'));
+ $minified = QueryAdapter::minify($q);
+
+ // First, check that count of 'o' values matches count of queries in group:
+ $callback = function ($carry, $item) {
+ return $carry + (isset($item['o']) ? 1 : 0);
+ };
+ $this->assertEquals(
+ count($minified[0]['g']),
+ array_reduce($minified[0]['g'], $callback, 0)
+ );
+
+ // Next, confirm that first operator is set to empty (filler) value:
+ $this->assertEquals('', $minified[0]['g'][0]['o']);
+
+ // Finally, make sure that we can round-trip back to the input.
+ $this->assertEquals($q, QueryAdapter::deminify($minified));
+ }
+
/**
* Test building an advanced query from a request.
*
diff --git a/themes/bootstrap3/templates/Recommend/VisualFacets.phtml b/themes/bootstrap3/templates/Recommend/VisualFacets.phtml
index a0b56b9cee5b95e53bb3738f81bff5baf2cda7df..a250ef53528f863094dac343f5eceb2bb3dd7fcc 100644
--- a/themes/bootstrap3/templates/Recommend/VisualFacets.phtml
+++ b/themes/bootstrap3/templates/Recommend/VisualFacets.phtml
@@ -12,11 +12,13 @@
$toplevelinfo['name'] = $toplevelfacet['value'];
$toplevelinfo['field'] = $toplevelfacet['field'];
$toplevelinfo['size'] = $toplevelfacet['count'];
- foreach($toplevelfacet['pivot'] as $secondlevelfacet) {
+ $pivot = isset($toplevelfacet['pivot']) ? $toplevelfacet['pivot'] : [];
+ foreach($pivot as $secondlevelfacet) {
$secondlevelinfo = [];
$secondlevelinfo['name'] = $secondlevelfacet['value'];
$secondlevelinfo['size'] = $secondlevelfacet['count'];
$secondlevelinfo['field'] = $secondlevelfacet['field'];
+ $secondlevelinfo['parentfield'] = $toplevelinfo['field'];
$secondlevelinfo['parentlevel'] = $toplevelinfo['name'];
array_push($toplevelchildren, $secondlevelinfo);
}
@@ -142,7 +144,7 @@
// Stop! Using this algorithm, sometimes all of the topics wind
// up in a "More" facet, which leads to a confusing display. If
// that happens, just display the top level, with no topic
- // boxes inside the callnumber-first box.
+ // boxes inside the main box.
if (morefacet == totalbyfirstpivot) {
var onechild = new Object();
@@ -158,8 +160,9 @@
var more = new Object();
more.name = "<?=$this->transEsc('More Topics')?>";
more.size = morefacet/totalbyfirstpivot * facetdata.size;
- more.field = "topic_facet";
+ more.field = ""; // this value doesn't matter, since parent field will be linked.
more.count = morecount;
+ more.parentfield = facetdata.field;
more.parentlevel = facetdata.name;
pivotdata.children[facetindex].children.push(more);
}
@@ -171,20 +174,20 @@
.enter().append("a")
.attr("href", function(d) {
if (d.parentlevel && d.name != "<?=$this->transEsc('More Topics')?>") {
- return window.location + "&filter[]=" + d.field + ":\"" + d.name + "\"&filter[]=callnumber-first:\"" + d.parentlevel + "\"&view=list";
+ return window.location + "&filter[]=" + d.field + ":\"" + encodeURIComponent(d.name) + "\"&filter[]=" + d.parentfield + ":\"" + encodeURIComponent(d.parentlevel) + "\"&view=list";
} else if (d.name == "<?=$this->transEsc('More Topics')?>") {
- return window.location + "&filter[]=callnumber-first:\"" + d.parentlevel + "\"";
+ return window.location + "&filter[]=" + d.parentfield + ":\"" + encodeURIComponent(d.parentlevel) + "\"";
} else if (d.name != "theData") {
- return window.location + "&filter[]=" + d.field + ":\"" + d.name + "\"";
+ return window.location + "&filter[]=" + d.field + ":\"" + encodeURIComponent(d.name) + "\"";
}
})
.append("div")
- .attr("class", function(d) { return d.field == "callnumber-first" ? "node toplevel" : "node secondlevel" })
+ .attr("class", function(d) { return (typeof d.parentfield === "undefined") ? "node toplevel" : "node secondlevel" })
.attr("id", function(d) { return d.name.replace(/\s+/g, ''); })
.call(position)
.style("background", function(d) { return d.children ? color(d.name.substr(0,1)) : null; })
.call(settitle)
- .style("z-index", function(d) { return d.field == "topic_facet" ? "1" : "0" })
+ .style("z-index", function(d) { return (typeof d.parentfield !== "undefined") ? "1" : "0" })
.attr("tabindex", 0)
.append("div")
.call(settext)
@@ -203,17 +206,34 @@ function position() {
function settext() {
this.text(function(d) {
- if (!d.children && d.field == "callnumber-first") {return "";}
- if (d.field == "callnumber-first") {return d.name + " (" + d.count + ")"; }
- if (d.field == "topic_facet" && d.name == "<?=$this->transEsc('More Topics')?>") {var topics = "<?=$this->translate('more_topics')?>"; return topics.replace("%%count%%", d.count); }
- if (d.field == "topic_facet") {return d.name + " (" + d.count + ")"; }
+ // Is this a top-level box?
+ var onTop = (typeof d.parentfield === "undefined");
+
+ // Case 1: top with no children -- no text!
+ if (!d.children && onTop) {
+ return "";
+ }
+
+ // Case 2: top-level field with contents:
+ if (onTop) {
+ return d.name + " (" + d.count + ")";
+ }
+
+ // Case 3: "More Topics" special-case collapsed block:
+ if (d.name == "<?=$this->transEsc('More Topics')?>") {
+ var topics = "<?=$this->translate('more_topics')?>";
+ return topics.replace("%%count%%", d.count);
+ }
+
+ // Csae 4 (default): Standard second-level field
+ return d.name + " (" + d.count + ")";
});
}
function setscreenreader() {
this.attr("class", "sr-only")
.text(function(d) {
- if (d.field == "topic_facet") {
+ if (typeof d.parentfield !== "undefined") {
return "<?=$this->transEsc('visual_facet_parent')?> " + d.parentlevel;
} else {
return "";
@@ -223,9 +243,20 @@ function setscreenreader() {
function settitle() {
this.attr("title", function(d) {
- if (d.field == "callnumber-first") {return d.name + " (" + d.count + " <?=$this->transEsc('items')?>)"; }
- if (d.field == "topic_facet" && d.name == "<?=$this->transEsc('More Topics')?>") {return d.count + " <?=$this->transEsc('More Topics')?>"; }
- if (d.field == "topic_facet") {var on_topic = "<?=$this->translate('on_topic')?>"; return d.name + " (" + on_topic.replace("%%count%%", d.count) + ")"; }
+ // Case 1: Top-level field
+ if (typeof d.parentfield === "undefined") {
+ return d.name + " (" + d.count + " <?=$this->transEsc('items')?>)";
+ }
+ // Case 2: "More Topics" special-case collapsed block:
+ if (d.name == "<?=$this->transEsc('More Topics')?>") {
+ return d.count + " <?=$this->transEsc('More Topics')?>";
+ }
+
+ // Case 3: Standard second-level field
+ if (typeof d.field !== "undefined") {
+ var on_topic = "<?=$this->translate('on_topic')?>";
+ return d.name + " (" + on_topic.replace("%%count%%", d.count) + ")";
+ }
});
}
diff --git a/themes/bootstrap3/templates/devtools/deminify.phtml b/themes/bootstrap3/templates/devtools/deminify.phtml
index daf211ce6f01a74cf93414a10be1ace95755a225..4874e7b00e1ca30030bf28e8b0682c08958cd534 100644
--- a/themes/bootstrap3/templates/devtools/deminify.phtml
+++ b/themes/bootstrap3/templates/devtools/deminify.phtml
@@ -4,7 +4,7 @@
<h2>Deminifier</h2>
-<? if (!$min): ?>
+<? if (empty($min)): ?>
<form method='POST'>
Minified text:
<textarea name="min"></textarea>
@@ -15,23 +15,23 @@
<pre><? print_r($min) ?></pre>
<? endif; ?>
-<? if ($results): ?>
+<? if (isset($results)): ?>
<h3>Results Object</h3>
<p>Class: <?=get_class($results)?></p>
<? endif; ?>
-<? if ($query): ?>
+<? if (isset($query)): ?>
<h3>Query Object</h3>
<pre><? print_r($query) ?></pre>
<? endif; ?>
-<? if ($backendParams || $queryParams): ?>
+<? if (isset($backendParams) || isset($queryParams)): ?>
<h3>Backend Parameters</h3>
- <? if ($queryParams): ?>
+ <? if (isset($queryParams)): ?>
<h4>Query Parameters</h4>
<pre><? print_r($queryParams) ?></pre>
<? endif ; ?>
- <? if ($backendParams): ?>
+ <? if (isset($backendParams)): ?>
<h4>Non-query Parameters</h4>
<pre><? print_r($backendParams) ?></pre>
<? endif ; ?>