Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 523518b

Browse files
author
Michael Grauer
committed
BUG: Refs #212. Batchmake icon now links to newly created index page.
1 parent 4e2f7c9 commit 523518b

File tree

5 files changed

+89
-2
lines changed

5 files changed

+89
-2
lines changed

modules/batchmake/Notification.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getLeftLink()
5858
$fc = Zend_Controller_Front::getInstance();
5959
$baseURL = $fc->getBaseUrl();
6060
$moduleWebroot = $baseURL . '/' . MIDAS_BATCHMAKE_MODULE;
61-
return array(ucfirst(MIDAS_BATCHMAKE_MODULE) => array($moduleWebroot . '/config', $baseURL . '/modules/batchmake/public/images/cmake.png'));
61+
return array(ucfirst(MIDAS_BATCHMAKE_MODULE) => array($moduleWebroot . '/index', $baseURL . '/modules/batchmake/public/images/cmake.png'));
6262
}
6363

6464
} //end class
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?php
2+
/*=========================================================================
3+
MIDAS Server
4+
Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
5+
69328 Lyon, FRANCE.
6+
7+
See Copyright.txt for details.
8+
This software is distributed WITHOUT ANY WARRANTY; without even
9+
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
10+
PURPOSE. See the above copyright notices for more information.
11+
=========================================================================*/
12+
13+
/**
14+
* Batchmake_IndexController
15+
*/
16+
class Batchmake_IndexController extends Batchmake_AppController
17+
{
18+
19+
/**
20+
* @method indexAction(), will display the index page of the batchmake module.
21+
*/
22+
public function indexAction()
23+
{
24+
$this->view->header = $this->t("BatchMake Server Side Processing");
25+
}
26+
27+
28+
29+
}//end class
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
add_subdirectory( components )
22

3-
add_midas_test( BatchmakeConfigController ConfigControllerTest.php )
3+
add_midas_test( BatchmakeConfigController ConfigControllerTest.php )
4+
add_midas_test( BatchmakeIndexController IndexControllerTest.php )
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
/*=========================================================================
3+
MIDAS Server
4+
Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
5+
69328 Lyon, FRANCE.
6+
7+
See Copyright.txt for details.
8+
This software is distributed WITHOUT ANY WARRANTY; without even
9+
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
10+
PURPOSE. See the above copyright notices for more information.
11+
=========================================================================*/
12+
13+
// need to include the module constant for this test
14+
require_once BASE_PATH.'/modules/batchmake/constant/module.php';
15+
require_once BASE_PATH.'/modules/batchmake/tests/controllers/BatchmakeControllerTest.php';
16+
17+
/** config controller tests*/
18+
class ConfigControllerTest extends BatchmakeControllerTest
19+
{
20+
21+
/** set up tests*/
22+
public function setUp()
23+
{
24+
$this->setupDatabase(array('default'));
25+
$this->enabledModules = array('batchmake');
26+
parent::setUp();
27+
}
28+
29+
/** test index action*/
30+
public function testIndexAction()
31+
{
32+
// for now just get the page
33+
$page = '/batchmake/index/index';
34+
$this->params = array();
35+
$this->getRequest()->setMethod('GET');
36+
$this->dispatchUrI($page);
37+
}
38+
39+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/*=========================================================================
3+
MIDAS Server
4+
Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
5+
69328 Lyon, FRANCE.
6+
7+
See Copyright.txt for details.
8+
This software is distributed WITHOUT ANY WARRANTY; without even
9+
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
10+
PURPOSE. See the above copyright notices for more information.
11+
=========================================================================*/
12+
13+
$this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.form.js');
14+
$this->headScript()->appendFile($this->apiWebroot.'/public/js/common/common.ajaxapi.js');
15+
?>
16+
<link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot?>/public/css/common/common.genericPage.css" />
17+
<div class="viewMain">
18+
</div>

0 commit comments

Comments
 (0)