Merge "Remove "Journal" checkbox option from profile completion. Bug 1408438"

htdocs/artefact/blog/db/upgrade.php

@@ -55,5 +55,9 @@ function xmldb_artefact_blog_upgrade($oldversion=0) {
         delete_records('artefact_cron', 'plugin', 'blog', 'callfunction', 'clean_post_files');
     }
 
+    if ($oldversion < 2015011500) {
+        delete_records('institution_config', 'field', 'progressbaritem_blog_blog');
+    }
+
     return true;
 }

htdocs/artefact/blog/lib.php

@@ -136,6 +136,10 @@ class ArtefactTypeBlog extends ArtefactType {
         }
     }
 
+    public static function is_allowed_in_progressbar() {
+        return false;
+    }
+
     /**
      * This function updates or inserts the artefact.  This involves putting
      * some data in the artefact table (handled by parent::commit()), and then

htdocs/artefact/blog/version.php

@@ -12,5 +12,5 @@
 defined('INTERNAL') || die();
 
 $config = new StdClass;
-$config->version = 2011091400;
-$config->release = '1.1.0';
+$config->version = 2015011500;
+$config->release = '1.1.1';

test/behat/features/journal_checkbox.feature

+@javascript @core @core_profile_completion @journal
+Feature: Checking the absence of the journal checkbox
+ In order not to see the Journal checkbox
+ As an admin
+ So I can complete my profile without needing to tick it
+
+Scenario: Checking the absence of the journal checkbox (Bug 1408438)
+ Given I log in as "admin" with password "Password1"
+ And I follow "Administration"
+ And I follow "Institutions"
+ When I choose "Profile completion" in "Institutions"
+ And I follow "Journals"
+ Then "Journal" "checkbox" should not exist
+