fIXED ci

prasanna-lmsace · Sep 25, 2023 · 231c29c · 231c29c
1 parent 661a99a
commit 231c29c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/actions/notification/tests/behat/pulse_notification_template.feature b/actions/notification/tests/behat/pulse_notification_template.feature
@@ -5,18 +5,18 @@ Feature: Configuring the pulseaction_notification plugin on the "Automation temp
   I need to be able to configure the pulse automation template
 
   Background:
-  Given the following "categories" exist:
-      | name  | category | idnumber |
-      | Cat 1 | 0        | CAT1     |
-  And the following "course" exist:
-      | fullname    | shortname | category |
-      | Course 1    | C1        | 0        |
-  And the following "users" exist:
-      | username | firstname | lastname | email |
-      | student1 | student | User 1 | student1@test.com |
-  And the following "course enrolments" exist:
-      | user     | course | role |
-      | student1 | C1     | student |
+    Given the following "categories" exist:
+        | name  | category | idnumber |
+        | Cat 1 | 0        | CAT1     |
+    And the following "course" exist:
+        | fullname    | shortname | category |
+        | Course 1    | C1        | 0        |
+    And the following "users" exist:
+        | username | firstname | lastname | email |
+        | student1 | student | User 1 | student1@test.com |
+    And the following "course enrolments" exist:
+        | user     | course | role |
+        | student1 | C1     | student |
 
   @javascript
   Scenario: Create notification template and instance

diff --git a/classes/automation/condition_base.php b/classes/automation/condition_base.php
@@ -152,7 +152,7 @@ public function process_instance_save($instanceid, $data) {
         // Remove empty values from data array.
         $filter = array_filter($data);
         // If 'status' is not set and there are no other non-empty values, stopped here.
-           if (!isset($data['status']) && empty($filter)) {
+        if (!isset($data['status']) && empty($filter)) {
             return true;
         }
 

diff --git a/classes/helper.php b/classes/helper.php
@@ -51,7 +51,10 @@ class helper {
      */
     public static function update_emailvars($templatetext, $subject, $course, $user, $mod, $sender) {
         global $DB, $CFG;
+
+        // Include placholders handler and user profile library.
         require_once($CFG->dirroot.'/mod/pulse/lib/vars.php');
+        require_once($CFG->dirroot.'/user/profile/lib.php');
 
         // Load user profile field data.
         $newuser = (object) ['id' => $user->id];

diff --git a/classes/plugininfo/pulseaction.php b/classes/plugininfo/pulseaction.php
@@ -72,7 +72,7 @@ public function load_settings(part_of_admin_tree $adminroot, $parentnodename, $h
             return;
         }
 
-        if (!$hassiteconfig or !file_exists($this->full_path('settings.php'))) {
+        if (!$hassiteconfig || !file_exists($this->full_path('settings.php'))) {
             return;
         }
 

diff --git a/classes/plugininfo/pulsecondition.php b/classes/plugininfo/pulsecondition.php
@@ -70,7 +70,7 @@ public function load_settings(part_of_admin_tree $adminroot, $parentnodename, $h
             return;
         }
 
-        if (!$hassiteconfig or !file_exists($this->full_path('settings.php'))) {
+        if (!$hassiteconfig || !file_exists($this->full_path('settings.php'))) {
             return;
         }
 

diff --git a/lib/vars.php b/lib/vars.php
@@ -452,6 +452,10 @@ public static function module_meta_fields() {
      */
     public static function session_fields() {
         global $CFG;
+        // Verify the face to face is installed. if not, prevent session placeholder inclusion.
+        if (!file_exists($CFG->dirroot.'/mod/facetoface/lib.php')) {
+            return [];
+        }
 
         require_once($CFG->dirroot.'/mod/facetoface/lib.php');
 

diff --git a/styles.css b/styles.css
@@ -292,7 +292,7 @@
 .path-admin-mod-pulse-automation-templates .filter-form-container #pulse-automation-filterform {
     background-color: #fff;
     border: 1px solid #ccc;
-    box-shadow: 0px 0 0px 0.1px;
+    box-shadow: 0 0 0 0.1px;
     padding: 15px;
     position: absolute;
     top: 80%;

diff --git a/tests/behat/pulse_automation_instance.feature b/tests/behat/pulse_automation_instance.feature
@@ -170,4 +170,3 @@ Feature: Pulse automation instances
       | Title     | WELCOME CONTENT |
     And I press "Save changes"
     And I should see "WELCOME CONTENT"
-
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             }
-            if (!$hassiteconfig or !file_exists($this->full_path('settings.php'))) {
+            if (!$hassiteconfig || !file_exists($this->full_path('settings.php'))) {
                 return;
             }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -170,4 +170,3 @@ Feature: Pulse automation instances
		\| Title \| WELCOME CONTENT \|
		And I press "Save changes"
		And I should see "WELCOME CONTENT"