MDL-27037, wiki editable in visiblegroups *edit disabled when not edi…

…table
mayankgupta · Apr 6, 2011 · 2eaf4b3 · 2eaf4b3
1 parent 408612d
commit 2eaf4b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
@@ -876,7 +876,7 @@ function wiki_user_can_edit($subwiki) {
             // There is one wiki per group.
             //
             // Only members of subwiki group could edit that wiki
-            if ($subwiki->groupid == groups_get_activity_group($cm)) {
+            if (groups_is_member($subwiki->groupid)) {
                 // Only edit capability needed
                 return has_capability('mod/wiki:editpage', $context);
             } else { // User is not part of that group

diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
@@ -155,6 +155,7 @@ protected function print_pagetitle() {
      */
     protected function setup_tabs($options = array()) {
         global $CFG, $PAGE;
+        $groupmode = groups_get_activity_groupmode($PAGE->cm);
 
         if (empty($CFG->usecomments) || !has_capability('mod/wiki:viewcomment', $PAGE->context)){
             unset($this->tabs['comments']);
@@ -164,6 +165,19 @@ protected function setup_tabs($options = array()) {
             unset($this->tabs['edit']);
         }
 
+        if ($groupmode and $groupmode == VISIBLEGROUPS){
+            $currentgroup = groups_get_activity_group($PAGE->cm);
+            $manage = has_capability('mod/wiki:managewiki', $PAGE->cm->context);
+            $edit = has_capability('mod/wiki:editpage', $PAGE->context);
+            if (!$manage and !($edit and groups_is_member($currentgroup))){ 
+                unset($this->tabs['edit']);
+            }
+        } else {
+            if (!has_capability('mod/wiki:editpage', $PAGE->context)){
+                unset($this->tabs['edit']);
+            }
+        }
+
 
         if (empty($options)) {
             $this->tabs_options = array('activetab' => substr(get_class($this), 10));