diff --git a/block_mahara_iena.php b/block_mahara_iena.php index 922ee9610778b5d937abe09ede012984ad5b7c15..40ddfb4130de148bc86db4a4b047daede9e9bca7 100644 --- a/block_mahara_iena.php +++ b/block_mahara_iena.php @@ -93,7 +93,13 @@ class block_mahara_iena extends block_base // for teachers and students if (count($result) == 0) { - $this->content->text .= '<button type="button" class="btn btn-block btn-primary iena-btn-big" disabled >'.get_string('acces_group', 'block_mahara_iena', $CFG->mahara_alias).'</button><p class="text-muted">Aucun groupe '.$CFG->mahara_alias.' n\'a encore été créé par l\'enseignant.</p>'; + if(!isset($this->content->text)){ + $this->content->text='<button type="button" class="btn btn-block btn-primary iena-btn-big" disabled >'.get_string('acces_group', 'block_mahara_iena', $CFG->mahara_alias).'</button><p class="text-muted">Aucun groupe '.$CFG->mahara_alias.' n\'a encore été créé par l\'enseignant.</p>'; + } + else{ + $this->content->text .= '<button type="button" class="btn btn-block btn-primary iena-btn-big" disabled >'.get_string('acces_group', 'block_mahara_iena', $CFG->mahara_alias).'</button><p class="text-muted">Aucun groupe '.$CFG->mahara_alias.' n\'a encore été créé par l\'enseignant.</p>'; + } + } elseif ($is_mahara_user) { // check if they are one mahara group per moodle group of juste one group and set link diff --git a/entity/block_mahara_iena_connexion.php b/entity/block_mahara_iena_connexion.php index 444dd285efe1eac871d779ffe27f43d89f9a5de4..cc6c74924af4c7920b54d3dec538cbd74bff80ac 100644 --- a/entity/block_mahara_iena_connexion.php +++ b/entity/block_mahara_iena_connexion.php @@ -5,7 +5,7 @@ * Date: 11/04/18 * Time: 16:23 */ -require_once('lib.php'); +require_once($CFG->dirroot.'/blocks/mahara_iena/lib.php'); class block_mahara_iena_connexion { @@ -339,13 +339,10 @@ class block_mahara_iena_connexion // $mo_user_group_id = $mo_user_groups[0][0]; $mo_user_group_id = $mo_group_id; $mo_group_name = groups_get_group_name($mo_user_group_id); - - $course_name=block_mahara_iena_getCourseName($COURSE->shortname); - $group = new stdClass(); $course_name=block_mahara_iena_getCourseName($COURSE->shortname); //$group->name = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name; - $group->name=$course_name . " – " . $mo_group_name, + $group->name=$course_name . " – " . $mo_group_name; $group->description = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name; $group->grouptype = 'course'; $group->request = true; diff --git a/mahara_iena.php b/mahara_iena.php index c9a15e9033bd8056bad4616bb7dd3dfbb5c33958..b692f4ca0c480118da45711a4086a7c70e86c39d 100644 --- a/mahara_iena.php +++ b/mahara_iena.php @@ -76,7 +76,6 @@ if (count($students) == 0) { )); } $course_name=block_mahara_iena_getCourseName($COURSE->shortname); - //All params used for mahara_group_create_groups her we can add/change some lines $params = array ( 'groups' => diff --git a/mahara_iena_groups.php b/mahara_iena_groups.php index c805d4bf28c0292ec475ba8f497e326e93cbaac1..56cef8347da10288d44530daaa7d5b5ea46792c2 100644 --- a/mahara_iena_groups.php +++ b/mahara_iena_groups.php @@ -76,7 +76,6 @@ if (count($students) == 0) { } $course_name=block_mahara_iena_getCourseName($COURSE->shortname); - array_push($mahara_groups, array( 'name' =>$course_name . " – " . $group->name, 'description' => get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $group->name, diff --git a/version.php b/version.php index 19ea7114fa1aaed642be5e951471427a3703abab..984d9e0e5a5468e17c477b7d698af0df25efd9d0 100644 --- a/version.php +++ b/version.php @@ -28,7 +28,7 @@ */ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2021102500; +$plugin->version = 2022062700; $plugin->requires = 2014051200; $plugin->component = 'block_mahara_iena'; $plugin->release = 'v1.0';