From 76b05d5ce54b1ecdf132e95e65063c333e050d32 Mon Sep 17 00:00:00 2001
From: Myriam Delaruelle <myriam.delaruelle@univ-lorraine.fr>
Date: Mon, 27 Jun 2022 10:17:37 +0200
Subject: [PATCH] fixed required lib, group name, version
---
block_mahara_iena.php | 8 +++++++-
entity/block_mahara_iena_connexion.php | 7 ++-----
mahara_iena.php | 1 -
mahara_iena_groups.php | 1 -
version.php | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/block_mahara_iena.php b/block_mahara_iena.php
index 922ee96..40ddfb4 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 444dd28..cc6c749 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 c9a15e9..b692f4c 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 c805d4b..56cef83 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 19ea711..984d9e0 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';
--
GitLab