mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

"MDL-13766, order repository instances"

Browse Source
This commit is contained in:
dongsheng 2008-09-04 05:23:15 +00:00
parent 497ec8c2a9
commit 1265fc59e8
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
repository/lib.php
View File

@ -108,7 +108,7 @@ class repository_type {
* @param boolean $visible
* @param integer $sortorder (don't really need set, it will be during create() call)
*/
public function __construct($typename = '', $typeoptions = array(), $visible = false, $sortorder = 0){
public function __construct($typename = '', $typeoptions = array(), $visible = true, $sortorder = 0){
global $CFG;
//set type attributs
@ -607,7 +607,7 @@ abstract class repository {
$id = $DB->insert_record('repository_instances', $record);
$options = array();
if (call_user_func($classname . '::has_instance_config')) {
$configs = call_user_func($classname . '::get_instance_option_names');
$configs = call_user_func($classname . '::get_instance_option_names');
foreach ($configs as $config) {
$options[$config] = $params[$config];
}
@ -886,7 +886,7 @@ class repository_exception extends moodle_exception {
function repository_get_instances($context=null, $userid = null, $onlyvisible = true, $type=null){
global $DB, $CFG, $USER;
$params = array();
$sql = 'SELECT i.*, r.type AS repositorytype, r.visible FROM {repository} r, {repository_instances} i WHERE ';
$sql = 'SELECT i.*, r.type AS repositorytype, r.sortorder, r.visible FROM {repository} r, {repository_instances} i WHERE ';
$sql .= 'i.typeid = r.id ';
if (!empty($userid) && is_numeric($userid)) {
$sql .= ' AND (i.userid = 0 or i.userid = ?)';
@ -909,6 +909,7 @@ function repository_get_instances($context=null, $userid = null, $onlyvisible =
$sql .= ' AND (r.type = ?)';
$params[] = $type;
}
$sql .= ' order by r.sortorder, i.name';
if(!$repos = $DB->get_records_sql($sql, $params)) {
$repos = array();
}
@ -1947,7 +1948,7 @@ final class repository_admin_form extends moodleform {
$mform =& $this->_form;
$strrequired = get_string('required');
$mform->addElement('hidden', 'edit', ($this->instance) ? $this->instance->get_typename() : 0);
$mform->addElement('hidden', 'new', $this->plugin);
$mform->addElement('hidden', 'plugin', $this->plugin);
@ -2007,11 +2008,7 @@ function repository_display_instances_list($context, $admin = false, $typename =
$stropt = get_string('operation', 'repository');
$updown = get_string('updown', 'repository');
$plugins = get_list_of_plugins('repository');
//retrieve list of instances. In administration context we want to display all
//instances even if the type is not visible. In course/user context we
//want to display only visible instances. The repository_get_instances()
//third parameter displays only visible type.
$instances = repository_get_instances($context,null,!$admin,$typename);
$instances = repository_get_instances($context,null,true,$typename);
$instancesnumber = count($instances);
$alreadyplugins = array();
$table = new StdClass;
@ -2026,14 +2023,6 @@ function repository_display_instances_list($context, $admin = false, $typename =
//$row .= ' <a href="' . $baseurl . '&amp;type='.$typename.'&amp;hide=' . $i->id . '"><img src="' . $CFG->pixpath . '/t/' . ($i->visible ? 'hide' : 'show') . '.gif" alt="' . get_string($i->visible ? 'hide' : 'show') . '" /></a>' . "\n";
$table->data[] = array($i->name, $type->get_readablename(),$row);
//display a grey row if the type is defined as not visible
if (isset($type) && !$type->get_visible()){
$table->rowclass[] = 'dimmed_text';
} else{
$table->rowclass[] = '';
}
if (!in_array($i->name, $alreadyplugins)) {
$alreadyplugins[] = $i->name;
}
@ -2061,7 +2050,7 @@ function repository_display_instances_list($context, $admin = false, $typename =
//create a unique type of instance
else {
if (repository_static_function($typename, 'has_multiple_instances')){
$addable = 1;
$addable = 1;
$instancehtml .= '<li><a href="'.$baseurl.'&amp;new='.$typename.'">'.get_string('create', 'repository')
.' "'.get_string('repositoryname', 'repository_'.$typename).'" '
.get_string('instance', 'repository').'</a></li>';