Release v1.11

UH-StudentServices · Mar 29, 2018 · 026d773 · 026d773
1 parent b73e011
commit 026d773
Show file tree

Hide file tree

Showing 225 changed files with 12,323 additions and 484 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# University of Helsinki Courses v1.111
+Päiväys: 19.03.2018
+
+## Muutokset
+  - DOO-2891: Moodle-alueen luontioikeus kurssin opettajille (ennen erillinen rooli).
+  - DOO-3391: Päivitettiin Moodle-alueen luonnin aputekstejä.
+  - DOO-3417: Editorina haluan muotoilla studies landing pagen kesäkurssien kuvaustekstiä.
+  - DOO-3389: Entity API -moduulin päivitys (1.8 -> 1.9).
+  - DOO-3400: Siirrettiin ja tyyliteltiin opetustapahtuman tyyppi kurssisivuilla
+  - DOO-3401: Opetuskieli: Sijainti muutettu. Näytetään kielen nimi lyhyen koodin sijaan.
+  - DOO-3402: RSS ja suosikit: Sijainti muutettu. Näytetään metatieto-osion alatunnisteessa.
+
+## Korjaukset
+  - DOO-2885: Moodle-alueen luontivirhe ei näkynyt käyttäjälle.
+  - DOO-3346: EntityMalformedException virhesanoma suosikkitoiminnallisuudessa.
+
+## Poistot
+  - DOO-2891: "Moodle integrator" -rooli poistettiin.
+
+
 # University of Helsinki Courses v1.110
 Päiväys: 22.02.2018
 

diff --git a/build-uh_coursepages.make b/build-uh_coursepages.make
@@ -33,7 +33,7 @@ projects[ctools][version] = "1.12"
 projects[date][version] = "2.9"
 projects[diff][version] = "3.2"
 projects[email][version] = "1.3"
-projects[entity][version] = "1.8"
+projects[entity][version] = "1.9"
 projects[entitycache][version] = "1.2"
 projects[entity_translation][version] = "1.0-beta5"
 projects[entity_translation][patch]["https://www.drupal.org/node/2777995"] = https://www.drupal.org/files/issues/entity-translation_title-overriding-fix-2777995-1_0.patch

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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 project = uhc_contact_card
 dependencies[] = ctools
 dependencies[] = email

diff --git a/...nt_administration_feature/uhc_content_administration_feature.features.user_permission.inc b/...nt_administration_feature/uhc_content_administration_feature.features.user_permission.inc
@@ -14,7 +14,6 @@ function uhc_content_administration_feature_user_default_permissions() {
   $permissions['Use Moodi button'] = array(
     'name' => 'Use Moodi button',
     'roles' => array(
-      'Moodle integrator' => 'Moodle integrator',
       'editor-in-chief of communications' => 'editor-in-chief of communications',
     ),
     'module' => 'uhc_moodi',

diff --git a/..._content_administration_feature/uhc_content_administration_feature.features.user_role.inc b/..._content_administration_feature/uhc_content_administration_feature.features.user_role.inc
@@ -10,12 +10,6 @@
 function uhc_content_administration_feature_user_default_roles() {
   $roles = array();
 
-  // Exported role: Moodle integrator.
-  $roles['Moodle integrator'] = array(
-    'name' => 'Moodle integrator',
-    'weight' => 6,
-  );
-
   // Exported role: open university editor.
   $roles['open university editor'] = array(
     'name' => 'open university editor',

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.110
+version = 7.x-1.111
 project = uhc_content_administration_feature
 dependencies[] = actions_permissions
 dependencies[] = admin_menu
@@ -440,7 +440,6 @@ features[user_permission][] = view uhc_ds_moodle_key_or_login on node
 features[user_permission][] = view uhc_ds_open_uni_registration on node
 features[user_permission][] = view uhc_ds_table_of_contents on node
 features[user_permission][] = view uhc_ds_title_and_credit on node
-features[user_role][] = Moodle integrator
 features[user_role][] = open university editor
 features[views_view][] = administration_nodes_open_university_editor
 features[views_view][] = notification_messages

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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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
@@ -3560,8 +3560,8 @@ function uhc_course_implementation_field_default_field_instances() {
           'field_multiple_limit_offset' => 0,
           'field_multiple_limit_order' => 0,
           'format' => array(
-            'iso' => 'iso',
-            'name' => 0,
+            'iso' => 0,
+            'name' => 'name',
             'name_native' => 0,
           ),
         ),

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.110
+version = 7.x-1.111
 project = uhc_course_implementation
 dependencies[] = ctools
 dependencies[] = date

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.110
+version = 7.x-1.111
 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
@@ -71,11 +71,10 @@ function template_preprocess_activity_rss_feed_link(&$variables) {
 function theme_activity_rss_feed_link($variables) {
   $output = '';
   if ($variables['path']) {
-    $output = '<span class="rss">';
     $output .= '<a href="' . url($variables['path']) . '" class="feed-icon" title="Subscribe this course activity">';
     $output .= '<img typeof="foaf:Image" src="/misc/feed.png" width="16" height="16" alt="Subscribe this course activity">';
+    $output .= '<span>RSS</span>';
     $output .= '</a>';
-    $output .= '</span>';
   }
   return $output;
 }

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.110
+version = 7.x-1.111
 project = uhc_course_implementation_activity_mece
 dependencies[] = uh_mece_notifications
 dependencies[] = uhc_course_implementation

diff --git a/...n_inherited_fields/uhc_course_implementation_inherited_fields.features.field_instance.inc b/...n_inherited_fields/uhc_course_implementation_inherited_fields.features.field_instance.inc
@@ -22,7 +22,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 95,
+        'weight' => 92,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -109,7 +109,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 102,
+        'weight' => 99,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -196,7 +196,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 97,
+        'weight' => 94,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -283,7 +283,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 98,
+        'weight' => 95,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -370,7 +370,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 109,
+        'weight' => 106,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -457,7 +457,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 99,
+        'weight' => 96,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -544,7 +544,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 108,
+        'weight' => 105,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -631,7 +631,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 105,
+        'weight' => 102,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -718,7 +718,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 96,
+        'weight' => 93,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -805,7 +805,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 104,
+        'weight' => 101,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -892,7 +892,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 101,
+        'weight' => 98,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -979,7 +979,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 100,
+        'weight' => 97,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -1066,7 +1066,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 103,
+        'weight' => 100,
       ),
       'sidebar' => array(
         'label' => 'above',
@@ -1153,7 +1153,7 @@ function uhc_course_implementation_inherited_fields_field_default_field_instance
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 107,
+        'weight' => 104,
       ),
       'sidebar' => array(
         'label' => 'above',

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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 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.110
+version = 7.x-1.111
 project = uhc_course_material_sort
 dependencies[] = behavior_weights
 dependencies[] = uhc_course_material