Version increment

UH-StudentServices · Jan 29, 2018 · 53a9c4f · 53a9c4f
1 parent 9922627
commit 53a9c4f
Show file tree

Hide file tree

Showing 70 changed files with 105 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# University of Helsinki Courses v1.107
+Päiväys: 25.01.2018
+
+## Lisäykset
+  - DOO-3225: Lisättiin "On-Behalf-Of" -otsikkotieto opettajan lähettämiin viesteihin.
+
+## Muutokset
+  - DOO-3332: Siirrytään käyttämään organisaatiorekisterin tuotantoversiota.
+
+## Korjaukset
+ - DOO-3338: Kurssisivuilta lähtevässä sähköpostissa näkyivät kaikki opiskelijat jakelussa.
+ - DOO-3270: Kommentit ja tulokset -haitareita ei enää näytetä, mikäli niissä ei ole sisältöä.
+
+
 # University of Helsinki Courses v1.106
 Päiväys: 11.01.2018
 

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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 project = uhc_comment
 dependencies[] = comment
 dependencies[] = ctools

diff --git a/modules/uhc_comment/uhc_comment.module b/modules/uhc_comment/uhc_comment.module
@@ -67,6 +67,16 @@ function uhc_comment_preprocess_comment(&$variables) {
 function uhc_comment_node_view($node, $view_mode, $langcode) {
   if ($node->type == 'course_implementation') {
     uhc_comment_add_accordion_target_to_pager_links();
+    if (!empty($node->content['comments'])) {
+      if (!uhc_comment_form_access($node)) {
+        if (count($node->content['comments']['comments']) > 0) {
+          $node->content['comments']['comment_form']['#access'] = FALSE;
+        }
+        else {
+          $node->content['comments']['#access'] = FALSE;
+        }
+      }
+    }
   }
 }
 
@@ -79,13 +89,6 @@ function uhc_comment_add_accordion_target_to_pager_links() {
  * Implements hook_form_FORM_ID_alter().
  */
 function uhc_comment_form_comment_node_course_implementation_form_alter(&$form, &$form_state, $form_id) {
-  if (!uhc_comment_form_access($form['#node'])) {
-    // Deny access to form.
-    $form['#access'] = FALSE;
-    // Hide "Add new comment" title.
-    drupal_add_css('div#comments h2.title {display: none;}', 'inline');
-  }
-
   _uhc_comment_set_default_reply_to_address($form);
 
   $form['#validate'][] = 'uhc_comment_comment_form_validate';

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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 project = uhc_course_hierarchy
 php = 5.4
 dependencies[] = uhc_autofill_metadata

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.106
+version = 7.x-1.107
 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,13 +671,15 @@ 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)) {
-    return '';
+  if ((!empty($field['entity']->field_imp_results) &&
+      uhc_course_collaboration_private_current_user_has_access_to_private_content()) ||
+      uhc_tour_is_demo_node($field['entity'])) {
+    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>';
   }
 
-  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>';
+  return '';
 }
 
 /**

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.106
+version = 7.x-1.107
 project = uhc_course_implementation_activity
 dependencies[] = comment
 dependencies[] = ctools

diff --git a/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.module b/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.module
@@ -165,19 +165,15 @@ function uhc_course_implementation_activity_send_notify_mail($comment) {
 
   // Fetch enrolled students' emails. Abort if none found.
   $students = uhc_course_collaboration_get_course_students(field_get_items('node', $node, 'field_imp_id')[0]['value']);
-  $to = '';
+  $recipients = array();
   foreach ($students as $student) {
     if (!empty($student['email'])) {
-      $to .= $student['email'] . ', ';
+      $recipients[] = $student['email'];
     }
   }
-  if (!$to) {
+  if (empty($recipients)) {
     return;
   }
-  else {
-    // Remove trailing separator
-    $to = substr($to, 0, -2);
-  }
 
   // Get teaching language (determines the language of sent emails)
   $field_imp_teaching_language = field_get_items('node', $node, 'field_imp_teaching_language');
@@ -220,9 +216,12 @@ function uhc_course_implementation_activity_send_notify_mail($comment) {
   $reply_to_email = field_get_items('comment', $comment, 'field_reply_to_email');
   if (!empty($reply_to_checked[0]['value']) && !empty($reply_to_email[0]['value'])) {
     $params['Reply-To'] = $reply_to_email[0]['value'];
+    $params['On-Behalf-Of'] = $reply_to_email[0]['value'];
   }
 
-  drupal_mail('uhc_course_implementation_activity', 'notification', $to, $selected_lang, $params, $from, TRUE);
+  foreach ($recipients as $to) {
+    drupal_mail('uhc_course_implementation_activity', 'notification', $to, $selected_lang, $params, $from, TRUE);
+  }
 }
 
 /**
@@ -237,6 +236,7 @@ function uhc_course_implementation_activity_mail($key, &$message, $params) {
     $message['headers']['Sender'] = $params['from'];
     if (!empty($params['Reply-To'])) {
       $message['headers']['Reply-To'] = $params['Reply-To'];
+      $message['headers']['On-Behalf-Of'] = $params['On-Behalf-Of'];
     }
   }
 }

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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 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.106
+version = 7.x-1.107
 project = uhc_doo_theme_features
 dependencies[] = block
 dependencies[] = context

diff --git a/modules/uhc_ds/uhc_ds.info b/modules/uhc_ds/uhc_ds.info
@@ -3,7 +3,7 @@ description = Display settings for UHC subsite.
 core = 7.x
 php = 5.5
 package = UHC
-version = 7.x-1.106
+version = 7.x-1.107
 project = uhc_ds
 dependencies[] = ctools
 dependencies[] = date_views

diff --git a/modules/uhc_elisa_chat/uhc_elisa_chat.info b/modules/uhc_elisa_chat/uhc_elisa_chat.info
@@ -2,5 +2,5 @@ name = UHC Elisa Chat
 description = Adds Elisa Chat to specified pages.
 core = 7.x
 package = UHC
-version = 7.x-1.106
+version = 7.x-1.107
 project = uhc_elisa_chat
diff --git a/modules/uhc_environment/uhc_environment.info b/modules/uhc_environment/uhc_environment.info
@@ -2,5 +2,5 @@ name = UHC Environment
 description = Appends an multilingual message about current environment.
 core = 7.x
 package = UHC
-version = 7.x-1.106
+version = 7.x-1.107
 dependencies[] = site_status_message
diff --git a/modules/uhc_event/uhc_event.info b/modules/uhc_event/uhc_event.info
@@ -2,7 +2,7 @@ name = UHC Event
 description = Provides event content type
 core = 7.x
 package = UHC
-version = 7.x-1.106
+version = 7.x-1.107
 project = uhc_event
 dependencies[] = ctools
 dependencies[] = date

diff --git a/modules/uhc_exam_results/uhc_exam_results.info b/modules/uhc_exam_results/uhc_exam_results.info
@@ -2,7 +2,7 @@ name = UHC Exam results
 description = Provides Exam results content type
 core = 7.x
 package = UHC
-version = 7.x-1.106
+version = 7.x-1.107
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = file

diff --git a/modules/uhc_favorites/uhc_favorites.info b/modules/uhc_favorites/uhc_favorites.info
@@ -2,7 +2,7 @@ name = UHC Favorites
 description = Provides ability to put courses into your favorites and send them via email.
 core = 7.x
 package = UHC
-version = 7.x-1.106
+version = 7.x-1.107
 project = uhc_favorites
 dependencies[] = favoritewidget
 dependencies[] = uhc_course_implementation