Restore bugfix and improvements

Bugfix: - Removes an unnecessary field from restore form, which prevented form validation. Improvement: - As long as we're are not able to sort results via api2, we return arrays in reverse order (desc). - Removes some more code no longer needed
bareos · Sep 7, 2015 · 1b71dee · 1b71dee
1 parent e20b015
commit 1b71dee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 59 deletions.
diff --git a/module/Job/src/Job/Controller/JobController.php b/module/Job/src/Job/Controller/JobController.php
@@ -297,8 +297,7 @@ private function getJobs()
 		$director = $this->getServiceLocator()->get('director');
 		$result = $director->send_command('llist jobs', 2, null);
                 $jobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-		array_multisort($jobs['result']['jobs'], SORT_DESC);
-                return $jobs['result']['jobs'];
+                return array_reverse($jobs['result']['jobs']);
 	}
 
 	private function getJobsByStatus($status=null, $days=null, $hours=null)
@@ -315,8 +314,7 @@ private function getJobsByStatus($status=null, $days=null, $hours=null)
 				$result = $director->send_command('llist jobs jobstatus='.$status, 2, null);
 			}
 			$jobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-			array_multisort($jobs['result']['jobs'], SORT_DESC);
-			return $jobs['result']['jobs'];
+			return array_reverse($jobs['result']['jobs']);
 		}
 		else {
 			return null;

diff --git a/module/Restore/src/Restore/Form/RestoreForm.php b/module/Restore/src/Restore/Form/RestoreForm.php
@@ -52,41 +52,6 @@ public function __construct($restore_params=null, $jobs=null, $clients=null, $fi
 		$this->jobids = $jobids;
 		$this->backups = $backups;
 
-		// Mode
-                if(isset($restore_params['mode'])) {
-                        $this->add(array(
-                                'name' => 'mode',
-                                'type' => 'checkbox',
-                                'options' => array(
-                                        'label' => 'Expert mode',
-					'use_hidden_element' => true,
-                                        'checked_value' => '1',
-					'unchecked_value' => '0',
-                                        ),
-                                'attributes' => array(
-                                                'id' => 'mode',
-                                                'value' => $restore_params['mode']
-                                        )
-                                )
-                        );
-                }
-                else {
-			$this->add(array(
-                                'name' => 'mode',
-                                'type' => 'checkbox',
-                                'options' => array(
-                                        'label' => 'Expert mode',
-                                        'use_hidden_element' => true,
-                                        'checked_value' => '1',
-                                        'unchecked_value' => '0',
-                                        ),
-                                'attributes' => array(
-                                                'id' => 'mode',
-                                        )
-                                )
-                        );
-                }
-
 		// Job
 		if(isset($restore_params['jobid'])) {
 			$this->add(array(
@@ -427,6 +392,8 @@ public function __construct($restore_params=null, $jobs=null, $clients=null, $fi
                                 ),
                         'attributes' => array(
                                 'value' => '/tmp/bareos-restores/',
+				'id' => 'where',
+				'size' => '30',
 				'placeholder' => 'e.g. / or /tmp/bareos-restores/'
                                 )
                         )

diff --git a/module/Restore/src/Restore/Model/RestoreTable.php b/module/Restore/src/Restore/Model/RestoreTable.php
@@ -25,27 +25,8 @@
 
 namespace Restore\Model;
 
-use Zend\Db\TableGateway\TableGateway;
-
 class RestoreTable
 {
-	protected $tableGateway;
-
-	public function __construct(TableGateway $tableGateway)
-	{
-		$this->tableGateway = $tableGateway;
-	}
-/*
-	public function fetchAll()
-	{
-		$resultSet = $this->tableGateway->select();
-		return $resultSet;
-	}
-*/
-
-	public function __construct()
-	{
-	}
 
 }
 
diff --git a/module/Restore/view/restore/restore/index.phtml b/module/Restore/view/restore/restore/index.phtml
@@ -32,7 +32,7 @@ $this->headTitle($title);
 
 	<div class="row">
 	<div class="col-md-12">
-	<pre style="font-size: 8pt;">
+	<pre>
 	<code>
         <?php echo $this->result; ?>
 	</code>