From e00c3751de4e8242e83ddad2adcbd887a37e3cba Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 27 Nov 2012 16:46:43 +1100 Subject: [PATCH] Minor updates --- application/classes/Controller/Domain.php | 4 +- application/classes/Controller/Library.php | 4 +- application/classes/Controller/Node.php | 4 +- application/classes/Controller/Stgpool.php | 4 +- application/classes/Model/STGPOOL.php | 3 + application/views/domain/detail.php | 4 +- application/views/stgpool/detail.php | 71 +++++++++++++++++++--- 7 files changed, 82 insertions(+), 12 deletions(-) diff --git a/application/classes/Controller/Domain.php b/application/classes/Controller/Domain.php index 9fcd1a8..ce80f07 100644 --- a/application/classes/Controller/Domain.php +++ b/application/classes/Controller/Domain.php @@ -39,7 +39,9 @@ class Controller_Domain extends Controller_TemplateDefault { )); } - public function action_detail($domain_name=NULL) { + public function action_detail() { + $domain_name = $this->request->param('id'); + if (is_null($domain_name) AND (empty($_POST['domain_name']) OR ! $domain_name = $_POST['domain_name'])) { SystemMessage::add(array( 'title'=>_('DOMAIN_NAME is required'), diff --git a/application/classes/Controller/Library.php b/application/classes/Controller/Library.php index 1fff750..302493e 100644 --- a/application/classes/Controller/Library.php +++ b/application/classes/Controller/Library.php @@ -39,7 +39,9 @@ class Controller_Library extends Controller_TemplateDefault { )); } - public function action_detail($library=NULL) { + public function action_detail() { + $library = $this->request->param('id'); + if (is_null($library) AND (empty($_POST['library_name']) OR ! $library = $_POST['library_name'])) { SystemMessage::add(array( 'title'=>_('LIBRARY_NAME is required'), diff --git a/application/classes/Controller/Node.php b/application/classes/Controller/Node.php index 53e1b6f..247fe1e 100644 --- a/application/classes/Controller/Node.php +++ b/application/classes/Controller/Node.php @@ -39,7 +39,9 @@ class Controller_Node extends Controller_TemplateDefault { )); } - public function action_detail($node_name=NULL) { + public function action_detail() { + $node_name = $this->request->param('id'); + if (is_null($node_name) AND (empty($_POST['node_name']) OR ! $node_name = $_POST['node_name'])) { SystemMessage::add(array( 'title'=>_('NODE_NAME is required'), diff --git a/application/classes/Controller/Stgpool.php b/application/classes/Controller/Stgpool.php index 3d65617..3410f85 100644 --- a/application/classes/Controller/Stgpool.php +++ b/application/classes/Controller/Stgpool.php @@ -39,7 +39,9 @@ class Controller_Stgpool extends Controller_TemplateDefault { )); } - public function action_detail($stgpool=NULL) { + public function action_detail() { + $stgpool = $this->request->param('id'); + if (is_null($stgpool) AND (empty($_POST['stgpool_name']) OR ! $stgpool = $_POST['stgpool_name'])) { SystemMessage::add(array( 'title'=>_('STGPOOL_NAME is required'), diff --git a/application/classes/Model/STGPOOL.php b/application/classes/Model/STGPOOL.php index 50b4100..0a8cc07 100644 --- a/application/classes/Model/STGPOOL.php +++ b/application/classes/Model/STGPOOL.php @@ -20,6 +20,9 @@ class Model_STGPOOL extends TSM_ORM { 'DEVCLASSES'=>array('foreign_key'=>'DEVCLASS_NAME','far_key'=>'DEVCLASS'), ); protected $_has_many = array( + 'COPYGROUP_AR'=>array('foreign_key'=>'DESTINATION','far_key'=>'STGPOOL_NAME'), + 'COPYGROUP_BU'=>array('foreign_key'=>'DESTINATION','far_key'=>'STGPOOL_NAME'), + 'MGMTCLASS'=>array('foreign_key'=>'MIGDESTINATION','far_key'=>'STGPOOL_NAME'), 'VOLUME'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'), ); diff --git a/application/views/domain/detail.php b/application/views/domain/detail.php index 9a92c58..33edfff 100644 --- a/application/views/domain/detail.php +++ b/application/views/domain/detail.php @@ -14,6 +14,7 @@ OS Last Access Last IP Addr + Client Opt load('config')->tsmdatatypes as $btype => $ctype) { ?> @@ -23,11 +24,12 @@ NODE->find_all() as $no) { ?> - NODE_NAME,$no->NODE_NAME); ?> + NODE_NAME,$no->NODE_NAME); ?> tsmclientversion(); ?> platform(); ?> display('LASTACC_TIME'); ?> display('TCP_ADDRESS'); ?> + display('OPTION_SET'); ?> load('config')->tsmdatatypes as $btype => $ctype) { ?> hasData($btype) ? 'Y' : 'N'; ?> diff --git a/application/views/stgpool/detail.php b/application/views/stgpool/detail.php index 7844b84..9e07d80 100644 --- a/application/views/stgpool/detail.php +++ b/application/views/stgpool/detail.php @@ -1,6 +1,6 @@ - + + +
+ @@ -71,7 +71,7 @@ NEXTSTGPOOL AND $so->POOLTYPE === 'PRIMARY') { ?> - + @@ -129,10 +129,6 @@ - - - - @@ -171,6 +167,67 @@
Information for this Storage Pool
Next Pool display('NEXTSTGPOOL'); ?>NEXTSTGPOOL,$so->display('NEXTSTGPOOL')); ?>
Migratable %Access DEVCLASSES->display('ACCESS_STRATEGY'); ?>
Total Storage PoolsDEVCLASSES->display('STGPOOL_COUNT'); ?>
Device Type DEVCLASSES->display('DEVTYPE'); ?>
+ + + + + + + + + + + + + + + + COPYGROUP_BU->where('SET_NAME','=','ACTIVE')->find_all() as $cgo) { ?> + + + + + + + + + + + + + + + + + + COPYGROUP_AR->where('SET_NAME','=','ACTIVE')->find_all() as $cgo) { ?> + + + + + + + + + + + + + + + + + MGMTCLASS->where('SET_NAME','=','ACTIVE')->find_all() as $mo) { ?> + + + + + +
Management classes that directly store here
 
Backup Management Classes
DomainMgmtClassCopy Group
DOMAIN_NAME,$cgo->display('DOMAIN_NAME')); ?>display('CLASS_NAME'); ?>display('COPYGROUP_NAME'); ?>
 
Archive Management Classes
DomainMgmtClassCopy Group
display('DOMAIN_NAME'); ?>display('CLASS_NAME'); ?>display('COPYGROUP_NAME'); ?>
 
HSM Management Classes
DomainMgmtClass
display('DOMAIN_NAME'); ?>display('CLASS_NAME'); ?>DEFAULTMC == 'Yes' ? '*' : ''; ?>
+
@@ -202,7 +259,7 @@ - + load('config')->tsmdatatypes as $btype => $ctype) { ?>
display('ACCESS'); ?> display('STATUS'); ?> READ_ERRORS,$vo->WRITE_ERRORS); ?>display('EST_CAPACITY_MB'); ?>display('PCT_UTILIZED'); ?> display('PCT_RECLAIM'); ?> getFSOnVol($ctype); ?>