Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2013-12-03 23:45:54 +01:00
commit 2574b28b81
3 changed files with 11 additions and 3 deletions

View File

@ -1176,13 +1176,14 @@ class core_admin_renderer extends plugin_renderer_base {
get_string('displayname', 'core_plugin'),
get_string('source', 'core_plugin'),
get_string('version', 'core_plugin'),
get_string('release', 'core_plugin'),
get_string('availability', 'core_plugin'),
get_string('actions', 'core_plugin'),
get_string('notes','core_plugin'),
);
$table->headspan = array(1, 1, 1, 1, 2, 1);
$table->headspan = array(1, 1, 1, 1, 1, 2, 1);
$table->colclasses = array(
'pluginname', 'source', 'version', 'availability', 'settings', 'uninstall', 'notes'
'pluginname', 'source', 'version', 'release', 'availability', 'settings', 'uninstall', 'notes'
);
foreach ($plugininfo as $type => $plugins) {
@ -1238,6 +1239,7 @@ class core_admin_renderer extends plugin_renderer_base {
}
$version = new html_table_cell($plugin->versiondb);
$release = new html_table_cell($plugin->release);
$isenabled = $plugin->is_enabled();
if (is_null($isenabled)) {
@ -1283,7 +1285,7 @@ class core_admin_renderer extends plugin_renderer_base {
$notes = new html_table_cell($requiredby.$updateinfo);
$row->cells = array(
$pluginname, $source, $version, $availability, $settings, $uninstall, $notes
$pluginname, $source, $version, $release, $availability, $settings, $uninstall, $notes
);
$table->data[] = $row;
}

View File

@ -64,6 +64,7 @@ $string['plugindisable'] = 'Disable';
$string['plugindisabled'] = 'Disabled';
$string['pluginenable'] = 'Enable';
$string['pluginenabled'] = 'Enabled';
$string['release'] = 'Release';
$string['requiredby'] = 'Required by: {$a}';
$string['requires'] = 'Requires';
$string['rootdir'] = 'Directory';

View File

@ -53,6 +53,8 @@ abstract class base {
public $versiondb;
/** @var int|float|string required version of Moodle core */
public $versionrequires;
/** @var mixed human-readable release information */
public $release;
/** @var array other plugins that this one depends on, lazy-loaded by {@link get_other_required_plugins()} */
public $dependencies;
/** @var int number of instances of the plugin - not supported yet */
@ -223,6 +225,9 @@ abstract class base {
if (isset($plugin->requires)) {
$this->versionrequires = $plugin->requires;
}
if (isset($plugin->release)) {
$this->release = $plugin->release;
}
if (isset($plugin->dependencies)) {
$this->dependencies = $plugin->dependencies;
}