No group mode: edit form and statistics data table fixed

Author: jerray

assignment.class.php

@@ -116,6 +116,10 @@ private function init_permission() {
         }
 
         // view edit
+        if ($this->group->mode == NOGROUPS) {
+            $this->capability['view'] = true;
+            $this->capability['edit'] = true;
+        }
     }
 
     /**
@@ -291,8 +295,13 @@ private function save_repo($repo = null, $github_info) {
     private function edit_form($repo = null) {
         global $PAGE, $USER;
 
-        // Group mode, check permission
-        if (($this->capability['view'] && !$this->capability['edit']) || !$this->group->id || !$this->isopen()) {
+        // check assignment status and user permission
+        if (!$this->isopen() || !$this->capability['edit']) {
+            return $this->show_repo($repo);
+        }
+
+        // Group mode, check permission and groupid
+        if ($this->group->mode && (!$this->capability['view'] || !$this->group->id)) {
             return $this->show_repo($repo);
         }
 

modules/git_logger.php

@@ -75,7 +75,7 @@ function get_statistics_by_user($userid) {
         }
 
         $sql = "SELECT
-                  userid, author, COUNT(*) AS commits, SUM(files) AS files,
+                  userid, author, email, COUNT(*) AS commits, SUM(files) AS files,
                   SUM(insertions) AS insertions, SUM(deletions) AS deletions,
                   SUM(insertions)+SUM(deletions) AS total
                 FROM `{$CFG->prefix}{$this->_table}`