Merge pull request #811 from oat-sa/TAO-2560-GenerisTree-added-sortin…

…g-by-Label Updated generis tree form (all data sorted by label)
oat-sa · Apr 27, 2016 · 1b0b7e8 · 1b0b7e8
2 parents a3be2c4 + da4583c
commit 1b0b7e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/manifest.php b/manifest.php
@@ -27,7 +27,7 @@
     'label' => 'Tao base',
     'description' => 'TAO meta-extension',
     'license' => 'GPL-2.0',
-    'version' => '2.24.0',
+    'version' => '2.24.1',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(
         'generis' => '>=2.12.0'

diff --git a/models/classes/GenerisTreeFactory.php b/models/classes/GenerisTreeFactory.php
@@ -150,7 +150,8 @@ private function buildChildNodes(core_kernel_classes_Class $class) {
 		    $searchResult = $class->searchInstances(array(), array(
 				'limit'		=> $limit,
 				'offset'	=> $this->offset,
-				'recursive'	=> false
+				'recursive'	=> false,
+				'order' => RDFS_LABEL,
 			));
 
 			foreach ($searchResult as $instance){

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -499,7 +499,7 @@ public function update($initialVersion) {
             $this->setVersion('2.22.0');
         }
 
-        $this->skip('2.22.0', '2.24.0');
+        $this->skip('2.22.0', '2.24.1');
 
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -499,7 +499,7 @@ public function update($initialVersion) { @@
                 $this->setVersion('2.22.0');
             }
-            $this->skip('2.22.0', '2.24.0');
+            $this->skip('2.22.0', '2.24.1');
         }
@@ Expand Down @@