v1.113 release

UH-StudentServices · Apr 19, 2018 · dee4dd3 · dee4dd3
1 parent 0703992
commit dee4dd3
Show file tree

Hide file tree

Showing 148 changed files with 10,956 additions and 2,013 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# University of Helsinki Courses v1.113
+Päiväys: 19.04.2018 
+
+## Lisäykset
+  - DOO-3284: Lisättiin arvosanajakautuma näkymä kurssisivulle
+
+## Korjaukset
+  - DOO-2885: Moodi-napin käyttö ei tunnistanut virhetilannetta.
+
+## Päivitykset
+  - DOO-3465: Styleguiden uusin versio käyttöön.
+  - DOO-3519: Tietoturvapäivitys (Display Suite -moduuli).
+
+
 # University of Helsinki Courses v1.112
 Päiväys: 29.03.2018
 

diff --git a/build-uh_coursepages.make b/build-uh_coursepages.make
@@ -176,7 +176,7 @@ projects[pathologic][version] = 2.12
 projects[embed_views][version] = 1.2
 
 ; Display suite
-projects[ds][version] = "2.14"
+projects[ds][version] = "2.15"
 projects[ds][subdir] = "contrib"
 ;# Patch for text in resilts view see: https://www.drupal.org/node/2345387
 ;projects[ds][patch][rename-total-results] = "https://www.drupal.org/files/issues/ds-rename_total_results_output-2345387-1.patch"
@@ -304,6 +304,10 @@ libraries[stomp_php][download][url] = "https://github.com/dejanb/stomp-php/archi
 libraries[stomp_php][directory_name] = "stomp_php"
 libraries[stomp_php][destination] = "libraries"
 
+libraries[highcharts][directory_name] = highcharts
+libraries[highcharts][download][type] = file
+libraries[highcharts][download][url] = https://cdnjs.cloudflare.com/ajax/libs/highcharts/6.0.7/highcharts.js
+
 ; Project contribs
 projects[uh_taxonomy_organisations][type] = module
 projects[uh_taxonomy_organisations][download][type] = git

diff --git a/modules/uhc_activemq_connector/uhc_activemq_connector.info b/modules/uhc_activemq_connector/uhc_activemq_connector.info
@@ -2,5 +2,5 @@ name = UHC ActiveMQ Connector
 description = This module is deprecated.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_activemq_connector
diff --git a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.info b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.info
@@ -2,7 +2,7 @@ name = UHC Analytics and Tracking
 description = Specifies statistics/analytics for portal.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_analytics_and_tracking
 dependencies[] = ctools
 dependencies[] = facetapi

diff --git a/modules/uhc_autofill_metadata/uhc_autofill_metadata.info b/modules/uhc_autofill_metadata/uhc_autofill_metadata.info
@@ -2,7 +2,7 @@ name = UHC Autofill Metadata
 description = Fetches user metadata from Shibboleth integration.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_autofill_metadata
 dependencies[] = ctools
 dependencies[] = features

diff --git a/modules/uhc_autologin/uhc_autologin.info b/modules/uhc_autologin/uhc_autologin.info
@@ -2,6 +2,6 @@ name = UHC Autologin
 description = Provides autologin services.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_autologin
 dependencies[] = shib_auth
diff --git a/modules/uhc_avatar/uhc_avatar.info b/modules/uhc_avatar/uhc_avatar.info
@@ -2,5 +2,5 @@ name = UHC Avatar
 description = Provides avatar (user image) related functionality
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_avatar
diff --git a/modules/uhc_cache_warmer/uhc_cache_warmer.info b/modules/uhc_cache_warmer/uhc_cache_warmer.info
@@ -2,5 +2,5 @@ name = UHC Cache Warmer
 description = Provides a drush command for generating a hub pages file for the cache_warmer module.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_cache_warmer
diff --git a/modules/uhc_comment/uhc_comment.info b/modules/uhc_comment/uhc_comment.info
@@ -2,7 +2,7 @@ name = UHC Comment
 description = Configures comments for this portal.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_comment
 dependencies[] = comment
 dependencies[] = ctools

diff --git a/modules/uhc_contact_card/uhc_contact_card.info b/modules/uhc_contact_card/uhc_contact_card.info
@@ -2,7 +2,7 @@ name = UHC Contact card
 description = Provides Contact Card content type
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_contact_card
 dependencies[] = ctools
 dependencies[] = email

diff --git a/modules/uhc_content_administration_feature/uhc_content_administration_feature.info b/modules/uhc_content_administration_feature/uhc_content_administration_feature.info
@@ -1,7 +1,7 @@
 name = UHC Content Administration
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_content_administration_feature
 dependencies[] = actions_permissions
 dependencies[] = admin_menu

diff --git a/modules/uhc_course/uhc_course.info b/modules/uhc_course/uhc_course.info
@@ -1,7 +1,7 @@
 name = UHC Course
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course
 dependencies[] = ctools
 dependencies[] = entity_token

diff --git a/modules/uhc_course_collaboration/uhc_course_collaboration.info b/modules/uhc_course_collaboration/uhc_course_collaboration.info
@@ -2,7 +2,7 @@ name = UHC Course Collaboration
 description = Organic Groups for course implementation nodes
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_collaboration
 dependencies[] = ctools
 dependencies[] = features

diff --git a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info
@@ -2,7 +2,7 @@ name = UHC Course Collaboration Private
 description = Extends collaboration by providing option to share content privately.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_collaboration_private
 dependencies[] = comment_og
 dependencies[] = conditional_fields

diff --git a/modules/uhc_course_hierarchy/uhc_course_hierarchy.info b/modules/uhc_course_hierarchy/uhc_course_hierarchy.info
@@ -2,7 +2,7 @@ name = UHC Course Hierarchy
 description = Shows the hierarchy for users in course implementation pages.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_hierarchy
 php = 5.4
 dependencies[] = uhc_autofill_metadata

diff --git a/modules/uhc_course_implementation/uhc_course_implementation.features.field_instance.inc b/modules/uhc_course_implementation/uhc_course_implementation.features.field_instance.inc
@@ -1538,13 +1538,8 @@ function uhc_course_implementation_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'taxonomy',
-        'settings' => array(
-          'field_multiple_limit' => -1,
-          'field_multiple_limit_offset' => 0,
-          'field_multiple_limit_order' => 0,
-        ),
-        'type' => 'taxonomy_term_reference_link',
+        'settings' => array(),
+        'type' => 'hidden',
         'weight' => 110,
       ),
       'sidebar' => array(
@@ -2901,13 +2896,8 @@ function uhc_course_implementation_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'text',
-        'settings' => array(
-          'field_multiple_limit' => -1,
-          'field_multiple_limit_offset' => 0,
-          'field_multiple_limit_order' => 0,
-        ),
-        'type' => 'text_default',
+        'settings' => array(),
+        'type' => 'hidden',
         'weight' => 111,
       ),
       'sidebar' => array(
@@ -3135,7 +3125,7 @@ function uhc_course_implementation_field_default_field_instances() {
           'view_mode' => 'default',
         ),
         'type' => 'entityreference_entity_view',
-        'weight' => 1,
+        'weight' => 2,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -4539,7 +4529,7 @@ function uhc_course_implementation_field_default_field_instances() {
           'field_multiple_limit_order' => 0,
         ),
         'type' => 'text_default',
-        'weight' => 80,
+        'weight' => 1,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -4631,7 +4621,7 @@ function uhc_course_implementation_field_default_field_instances() {
           'field_multiple_limit_order' => 0,
         ),
         'type' => 'text_default',
-        'weight' => 81,
+        'weight' => 2,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -4720,7 +4710,7 @@ function uhc_course_implementation_field_default_field_instances() {
           'field_multiple_limit_order' => 0,
         ),
         'type' => 'link_default',
-        'weight' => 82,
+        'weight' => 3,
       ),
       'sidebar' => array(
         'label' => 'above',

diff --git a/modules/uhc_course_implementation/uhc_course_implementation.field_group.inc b/modules/uhc_course_implementation/uhc_course_implementation.field_group.inc
@@ -502,7 +502,8 @@ function uhc_course_implementation_field_group_info() {
     'weight' => '29',
     'children' => array(
       0 => 'field_imp_results',
-      1 => 'uhc_course_implementation_exam_results_info_text',
+      1 => 'uhc_grades',
+      2 => 'uhc_course_implementation_exam_results_info_text',
     ),
     'format_type' => 'accordion-item',
     'format_settings' => array(

diff --git a/modules/uhc_course_implementation/uhc_course_implementation.info b/modules/uhc_course_implementation/uhc_course_implementation.info
@@ -2,7 +2,7 @@ name = UHC Course implementation
 description = This feature provides content type for course implementations
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_implementation
 dependencies[] = ctools
 dependencies[] = date

diff --git a/modules/uhc_course_implementation/uhc_course_implementation.module b/modules/uhc_course_implementation/uhc_course_implementation.module
@@ -671,9 +671,11 @@ function uhc_course_implementation_help_texts_messages(&$content, $node, $drupal
  * Callback for exam results info text.
  */
 function uhc_course_implementation_exam_results_info_text($field) {
-  if ((!empty($field['entity']->field_imp_results) &&
+  $node = $field['entity'];
+
+  if ((uhc_course_implementation_has_exam_result_files($node) &&
       uhc_course_collaboration_private_current_user_has_access_to_private_content()) ||
-      uhc_tour_is_demo_node($field['entity'])) {
+      uhc_tour_is_demo_node($node)) {
     return '<div class="messages views-system-message status info alternative"><p>'
       . t('Results are available for six months after they have been published')
       . '</p></div>';
@@ -682,6 +684,22 @@ function uhc_course_implementation_exam_results_info_text($field) {
   return '';
 }
 
+function uhc_course_implementation_has_exam_result_files($node) {
+  if ($node) {
+    $exam_results = field_get_items('node', $node, 'field_imp_results');
+
+    if (!empty($exam_results)) {
+      foreach ($exam_results as $exam_result) {
+        if (!empty(field_get_items('node', $exam_result['entity'], 'field_result_files'))) {
+          return TRUE;
+        }
+      }
+    }
+  }
+
+  return FALSE;
+}
+
 /**
  * Implements hook_entity_presave().
  */

diff --git a/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.info b/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Activity
 description = Tracks activity of course implementation.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_implementation_activity
 dependencies[] = comment
 dependencies[] = ctools

diff --git a/modules/uhc_course_implementation_activity_mece/uhc_course_implementation_activity_mece.info b/modules/uhc_course_implementation_activity_mece/uhc_course_implementation_activity_mece.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Activity MECE
 description = Sends all activity notifications to Message Center.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_implementation_activity_mece
 dependencies[] = uh_mece_notifications
 dependencies[] = uhc_course_implementation

diff --git a/...hc_course_implementation_inherited_fields/uhc_course_implementation_inherited_fields.info b/...hc_course_implementation_inherited_fields/uhc_course_implementation_inherited_fields.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Inherited Fields
 description = Holds field values that comes from course from the time when course implementation was active.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_implementation_inherited_fields
 dependencies[] = ctools
 dependencies[] = ds

diff --git a/modules/uhc_course_implementation_source/uhc_course_implementation_source.info b/modules/uhc_course_implementation_source/uhc_course_implementation_source.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Source
 description = Provides the source data for course implementation.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_implementation_source
 files[] = includes/UHCCourseImplementationMessageProcessor.inc
 files[] = migrate/CourseImplementationDestinationNode.inc

diff --git a/modules/uhc_course_material/uhc_course_material.info b/modules/uhc_course_material/uhc_course_material.info
@@ -1,7 +1,7 @@
 name = UHC Course material
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_material
 dependencies[] = ctools
 dependencies[] = entityreference

diff --git a/modules/uhc_course_material_dnd/uhc_course_material_dnd.info b/modules/uhc_course_material_dnd/uhc_course_material_dnd.info
@@ -2,6 +2,6 @@ name = UHC Course Material Drag 'N Drop
 description = Provides UX for drag and dropping materials to a course implementation.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_material_dnd
 dependencies[] = uhc_course_material
diff --git a/modules/uhc_course_material_sort/uhc_course_material_sort.info b/modules/uhc_course_material_sort/uhc_course_material_sort.info
@@ -2,7 +2,7 @@ name = UHC Course Material Sort
 description = Provides Alphabetical sorting for course material.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_material_sort
 dependencies[] = behavior_weights
 dependencies[] = uhc_course_material
diff --git a/modules/uhc_course_source/uhc_course_source.info b/modules/uhc_course_source/uhc_course_source.info
@@ -2,7 +2,7 @@ name = UHC Course Source
 description = Provides the source data for courses.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_source
 files[] = includes/UHCCourseMessageProcessor.inc
 files[] = migrate/CourseNodeMigration.inc

diff --git a/modules/uhc_course_tasks_and_material/uhc_course_tasks_and_material.info b/modules/uhc_course_tasks_and_material/uhc_course_tasks_and_material.info
@@ -2,7 +2,7 @@ name = UHC Course tasks and material
 description = Provide content type for tasks and material - used on courses
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_course_tasks_and_material
 dependencies[] = ctools
 dependencies[] = entityreference

diff --git a/modules/uhc_css_js_aggregation/uhc_css_js_aggregation.info b/modules/uhc_css_js_aggregation/uhc_css_js_aggregation.info
@@ -2,7 +2,7 @@ name = UHC CSS/JS Aggregation
 description = Advanced CSS/JS aggregation settings
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 dependencies[] = advagg
 dependencies[] = advagg_mod
 dependencies[] = ctools

diff --git a/modules/uhc_date_format/uhc_date_format.info b/modules/uhc_date_format/uhc_date_format.info
@@ -2,7 +2,7 @@ name = UHC Date format
 description = Date formats
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_date_format
 dependencies[] = ctools
 dependencies[] = strongarm

diff --git a/modules/uhc_dev_feature/uhc_dev_feature.info b/modules/uhc_dev_feature/uhc_dev_feature.info
@@ -2,7 +2,7 @@ name = UHC Dev
 description = Useful views etc. for development phase.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_dev_feature
 dependencies[] = views
 features[ctools][] = views:views_default:3.0

diff --git a/modules/uhc_doo_theme_features/uhc_doo_theme_features.info b/modules/uhc_doo_theme_features/uhc_doo_theme_features.info
@@ -2,7 +2,7 @@ name = UHC DOO theme
 description = Theme settings for DOO project which override and extend the main theme feature which was included in the main theme settings.
 core = 7.x
 package = UHC
-version = 7.x-1.112
+version = 7.x-1.113
 project = uhc_doo_theme_features
 dependencies[] = block
 dependencies[] = context