Merge remote-tracking branch 'origin/MOODLE_29_DEV' into MOODLE_29_ST…

…ABLE
kaltura · Dec 31, 2015 · 8700b50 · 8700b50
2 parents 450e5fe + f8419c9
commit 8700b50
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 44 deletions.
diff --git a/filter/kaltura/version.php b/filter/kaltura/version.php
@@ -24,10 +24,10 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2015101809;
+$plugin->version = 2015120909;
 $plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );
diff --git a/lib/editor/atto/plugins/kalturamedia/version.php b/lib/editor/atto/plugins/kalturamedia/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015101809;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2015120909;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires  = 2014050800;        // Requires this Moodle version.
 $plugin->component = 'atto_kalturamedia';  // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );
diff --git a/lib/editor/tinymce/plugins/kalturamedia/version.php b/lib/editor/tinymce/plugins/kalturamedia/version.php
@@ -23,12 +23,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015101809;
+$plugin->version   = 2015120909;
 $plugin->release = 'Kaltura release 4.0.08';
 // Required Moodle version.
 $plugin->requires  = 2014050800;
 // Full name of the plugin (used for diagnostics).
 $plugin->component = 'tinymce_kalturamedia';
 $plugin->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );
diff --git a/local/kaltura/db/upgrade.php b/local/kaltura/db/upgrade.php
@@ -59,13 +59,13 @@ function xmldb_local_kaltura_upgrade($oldversion) {
         }
 
         // Kaltura savepoint reached.
-        upgrade_plugin_savepoint(true, 2015101809, 'local', 'kaltura');
+        upgrade_plugin_savepoint(true, 2015120909, 'local', 'kaltura');
         $savePointDone = true;
     }
 
-    if (!$savePointDone && $oldversion < 2015101809) {
+    if (!$savePointDone && $oldversion < 2015120909) {
         // Kaltura savepoint reached.
-        upgrade_plugin_savepoint(true, 2015101809, 'local', 'kaltura');
+        upgrade_plugin_savepoint(true, 2015120909, 'local', 'kaltura');
     }
     return true;
 }
diff --git a/local/kaltura/tests/locallib_test.php b/local/kaltura/tests/locallib_test.php
@@ -1002,7 +1002,7 @@ public function test_local_kaltura_get_kaf_publishing_data_for_non_admin() {
         $json .= ',{"courseId":"'.$coursetwo->id.'","courseName":"'.$coursetwo->fullname.'","roles":"Learner"}';
         $json .= ',{"courseId":"'.$coursefour->id.'","courseName":"'.$coursefour->fullname.'","roles":"Instructor"}]}';
 
-        $this->assertEquals($json, $result);
+        $this->assertEquals(base64_encode($json), $result);
     }
 
     /**
@@ -1046,7 +1046,7 @@ public function test_local_kaltura_get_kaf_publishing_data_for_admin() {
         $json .= ',{"courseId":"'.$coursethree->id.'","courseName":"'.$coursethree->fullname.'","roles":"urn:lti:sysrole:ims\/lis\/Administrator"}';
         $json .= ',{"courseId":"'.$coursefour->id.'","courseName":"'.$coursefour->fullname.'","roles":"urn:lti:sysrole:ims\/lis\/Administrator"}]}';
 
-        $this->assertEquals($json, $result);
+        $this->assertEquals(base64_encode($json), $result);
     }
 
     /**

diff --git a/local/kaltura/version.php b/local/kaltura/version.php
@@ -25,7 +25,7 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2015101809;
+$plugin->version = 2015120909;
 $plugin->component = 'local_kaltura';
 $plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires = 2014050800;

diff --git a/local/kalturamediagallery/lib.php b/local/kalturamediagallery/lib.php
@@ -27,7 +27,7 @@
  * @param global_navigation $navigation a global_navigation object
  * @return void
  */
-function local_kalturamediagallery_extends_navigation($navigation) {
+function local_kalturamediagallery_extend_navigation($navigation) {
     global $USER, $PAGE, $DB;
 
     if (empty($USER->id)) {

diff --git a/local/kalturamediagallery/version.php b/local/kalturamediagallery/version.php
@@ -26,11 +26,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2015101809;
+$plugin->version = 2015120909;
 $plugin->component = 'local_kalturamediagallery';
 $plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );
diff --git a/local/mymedia/lib.php b/local/mymedia/lib.php
@@ -26,7 +26,7 @@
  * @param global_navigation $navigation a global_navigation object
  * @return void
  */
-function local_mymedia_extends_navigation($navigation) {
+function local_mymedia_extend_navigation($navigation) {
     global $USER, $DB, $PAGE;
 
     if (empty($USER->id)) {

diff --git a/local/mymedia/version.php b/local/mymedia/version.php
@@ -25,11 +25,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2015101809;
+$plugin->version = 2015120909;
 $plugin->component = 'local_mymedia';
 $plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );
diff --git a/mod/kalvidassign/pix/icon.gif b/mod/kalvidassign/pix/icon.gif
diff --git a/mod/kalvidassign/pix/icon.png b/mod/kalvidassign/pix/icon.png
diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php
@@ -358,6 +358,9 @@ public function col_status($data) {
         }
 
         $buttontext = '';
+        // Check if the user submitted the assignment.
+        $submitted = !is_null($data->timemarked);
+
         if ($data->timemarked > 0) {
             $class = 's1';
             $buttontext = get_string('update');
@@ -366,6 +369,11 @@ public function col_status($data) {
             $buttontext  = get_string('grade');
         }
 
+        if (!$submitted) {
+            $class ='s1';
+            $buttontext = get_string('nosubmission', 'kalvidassign');
+        }
+
         $attr = array('id' => 'up'.$data->id,
                       'class' => $class);
 
@@ -727,11 +735,11 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all'
 
         // Compare student who have submitted to the assignment with students who are
         // currently enrolled in the course
-        $students = kalvidassign_get_assignment_students($cm);
-        $users = array_intersect(array_keys($users), array_keys($students));
+        $students = array_keys(kalvidassign_get_assignment_students($cm));
+        $users = array_intersect(array_keys($users), $students);
 
-        if (empty($users)) {
-            echo html_writer::tag('p', get_string('nosubmissionsforgrading', 'kalvidassign'));
+        if (empty($students)) {
+            echo html_writer::tag('p', get_string('noenrolledstudents', 'kalvidassign'));
             return;
         }
 
@@ -781,21 +789,6 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all'
                 // No groups, do nothing
                 break;
             case SEPARATEGROUPS:
-                // If separate groups, but displaying all users then we must display only users
-                // who are in the same group as the current user
-                if (0 == $groupfilter) {
-                    $groupscolumn = ', gm.groupid ';
-                    $groupsjoin   = ' RIGHT JOIN {groups_members} gm ON gm.userid = u.id RIGHT JOIN {groups} g ON g.id = gm.groupid ';
-
-                    $param['courseid'] = $cm->course;
-                    $groupswhere  .= ' AND g.courseid = :courseid ';
-
-                    $param['groupid'] = $groupfilter;
-                    $groupswhere .= ' AND g.id IN ('.$groupids.') ';
-
-                }
-                break;
-
             case VISIBLEGROUPS:
                 // if visible groups but displaying a specific group then we must display users within
                 // that group, if displaying all groups then display all users in the course
@@ -821,7 +814,7 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all'
         $columns = user_picture::fields('u').', kvs.id AS submitid, ';
         $columns .= ' kvs.grade, kvs.submissioncomment, kvs.timemodified, kvs.entry_id, kvs.source, kvs.width, kvs.height, kvs.timemarked, ';
         $columns .= 'kvs.metadata, 1 AS status, 1 AS selectgrade'.$groupscolumn;
-        $where .= ' u.deleted = 0 AND u.id IN ('.implode(',', $users).') '.$groupswhere;
+        $where .= ' u.deleted = 0 AND u.id IN ('.implode(',', $students).') '.$groupswhere;
 
         $param['instanceid'] = $cm->instance;
         $from = "{user} u LEFT JOIN {kalvidassign_submission} kvs ON kvs.userid = u.id AND kvs.vidassignid = :instanceid ".$groupsjoin;

diff --git a/mod/kalvidassign/version.php b/mod/kalvidassign/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$module->version = 2015101809;
+$module->version = 2015120909;
 $module->component  = 'mod_kalvidassign';
 $module->release    = 'Kaltura release 4.0.08';
 $module->requires = 2014050800;
 $module->cron       = 0;
 $module->maturity = MATURITY_STABLE;
 $module->dependencies = array(
-    'local_kaltura' => 2015101809,
+    'local_kaltura' => 2015120909,
 );
diff --git a/mod/kalvidpres/pix/icon.gif b/mod/kalvidpres/pix/icon.gif
diff --git a/mod/kalvidpres/pix/icon.png b/mod/kalvidpres/pix/icon.png
diff --git a/mod/kalvidpres/version.php b/mod/kalvidpres/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$module->version = 2015101809;
+$module->version = 2015120909;
 $module->component  = 'mod_kalvidpres';
 $module->release    = 'Kaltura release 4.0.08';
 $module->requires = 2014050800;
 $module->cron       = 0;
 $module->maturity = MATURITY_STABLE;
 $module->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );
diff --git a/mod/kalvidres/mod_form.php b/mod/kalvidres/mod_form.php
@@ -129,6 +129,7 @@ public function definition() {
         $this->add_intro_editor(false);
 
         $mform->addElement('header', 'video', get_string('video_hdr', 'kalvidres'));
+        $mform->setExpanded('video',true);
         $this->add_video_definition($mform);
 
         $this->standard_coursemodule_elements();

diff --git a/mod/kalvidres/pix/icon.gif b/mod/kalvidres/pix/icon.gif
diff --git a/mod/kalvidres/pix/icon.png b/mod/kalvidres/pix/icon.png
diff --git a/mod/kalvidres/version.php b/mod/kalvidres/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$module->version = 2015101809;
+$module->version = 2015120909;
 $module->component  = 'mod_kalvidres';
 $module->release    = 'Kaltura release 4.0.08';
 $module->requires = 2014050800;
 $module->cron       = 0;
 $module->maturity = MATURITY_STABLE;
 $module->dependencies = array(
-    'local_kaltura' => 2015101809
+    'local_kaltura' => 2015120909
 );