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

Commit 14e618e

Browse files
author
Charles Ma
committed
BUG: refs #301 Fixed dashboard (style)
1 parent 4ad1954 commit 14e618e

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

core/controllers/components/DemoComponent.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public function reset()
7575
$applicationConfig['global']['demomode'] = true;
7676
$applicationConfig['global']['environment'] = 'development';
7777
$applicationConfig['global']['application.name'] = 'MIDAS - Demo';
78-
$applicationConfig['global']['application.description'] = 'MIDAS integrates multimedia server technology with Kitware?s open-source data analysis and visualization clients. The server follows open standards for data storage, access and harvesting';
78+
$applicationConfig['global']['application.description'] = 'MIDAS integrates multimedia server technology with Kitware?s open-source ';
79+
$applicationConfig['global']['application.description'] .= 'data analysis and visualization clients. The server follows open standards for data storage, access and harvesting';
7980
$applicationConfig['global']['application.keywords'] = 'demonstration, data management, visualization';
8081

8182
$enabledModules = array('visualize', 'oai', 'metadataextractor', 'api', 'scheduler', 'thumbnailcreator', 'statistics');

core/controllers/components/UtilityComponent.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ public function getAllModules()
1919
$modules = array();
2020
if(file_exists(BASE_PATH.'/modules/') && opendir(BASE_PATH.'/modules/'))
2121
{
22-
$array = $this->initModulesConfig(BASE_PATH.'/modules/');
22+
$array = $this->_initModulesConfig(BASE_PATH.'/modules/');
2323
$modules = array_merge($modules, $array);
2424
}
2525

2626
if(file_exists(BASE_PATH.'/privateModules/') && opendir(BASE_PATH.'/privateModules/'))
2727
{
28-
$array = $this->initModulesConfig(BASE_PATH.'/privateModules/');
28+
$array = $this->_initModulesConfig(BASE_PATH.'/privateModules/');
2929
$modules = array_merge($modules, $array);
3030
}
3131

3232
return $modules;
3333
}
3434

3535
/** find modules configuration in a folder */
36-
private function initModulesConfig($dir)
36+
private function _initModulesConfig($dir)
3737
{
3838
$handle = opendir($dir);
3939
while(false !== ($file = readdir($handle)))

core/models/MIDASDatabasePdo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ protected function getLinkedObject($var, $dao)
155155
{
156156
$return[] = $model->initDao($this->_mainData[$var]['model'], $row);
157157
}
158-
158+
159159
return $return;
160160
} //end getLinkedObject
161161

core/models/pdo/GroupModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function addUser($group, $user)
5454
$this->addUser($groupMember, $user);
5555
}
5656
}
57-
57+
5858
$this->database->link('users', $group, $user);
5959
} // end function addItem
6060

0 commit comments

Comments
 (0)