conceptScheme pages should now work as expected, fixes #591 and #585

NatLibFi · Mar 2, 2017 · 0381442 · 0381442
1 parent 75d4a8e
commit 0381442
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controller/WebController.php b/controller/WebController.php
@@ -192,7 +192,7 @@ public function invokeVocabularyConcept($request)
             $this->invokeGenericErrorPage($request);
             return;
         }
-        $template = (in_array('skos:Concept', $results[0]->getType())) ? $this->twig->loadTemplate('concept-info.twig') : $this->twig->loadTemplate('group-contents.twig');
+        $template = (in_array('skos:Concept', $results[0]->getType()) || in_array('skos:ConceptScheme', $results[0]->getType())) ? $this->twig->loadTemplate('concept-info.twig') : $this->twig->loadTemplate('group-contents.twig');
 
         $crumbs = $vocab->getBreadCrumbs($request->getContentLang(), $uri);
         echo $template->render(array(

diff --git a/resource/js/hierarchy.js b/resource/js/hierarchy.js
@@ -394,7 +394,7 @@ function getTreeConfiguration() {
                   schemeObjects = []; 
                 } 
                 // concept scheme page
-                else if (node.id === '#' && $('tbody > tr:nth-of-type(3) p').html() === 'skos:ConceptScheme') {
+                else if (node.id === '#' && $('.property-value-wrapper:first() p').html() === 'skos:ConceptScheme') {
                   nodeId = $('.uri-input-box').html(); // using the real uri of the concept from the view.
                   json_url = (rest_base_url + vocab + '/topConcepts');
                   params = $.param({'scheme': nodeId, 'lang' : clang});