Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF

pandora_console/godmode/alerts/alert_list.builder.php

@@ -184,9 +184,11 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
     }
 
     ui_require_css_file('cluetip', 'include/styles/js/');
+    ui_require_jquery_file('validate');
     ui_require_jquery_file('cluetip');
     ui_require_jquery_file('pandora.controls');
     ui_require_jquery_file('bgiframe');
+
     ?>
 <script type="text/javascript">
 /* <![CDATA[ */
@@ -202,6 +204,24 @@ $(document).ready (function () {
     });
 <?php endif; ?>
 
+    // Rule.
+    $.validator.addMethod(
+        "valueNotEquals",
+        function(value, element, arg) {
+            return arg != value;
+        },
+        "Value must not equal arg."
+    );
+
+    // configure your validation
+    $("form.add_alert_form").validate({
+        rules: {
+            id_agent_module: { valueNotEquals: "0" }
+        },
+        messages: {
+            id_agent_module: { valueNotEquals: "Please select an item!" }
+        }
+    });
     $("select#template").change (function () {
         id = this.value;
         $a = $(this).siblings ("a.template_details");

pandora_console/include/class/WelcomeWindow.class.php

@@ -789,6 +789,9 @@ class WelcomeWindow extends Wizard
             // Finished! do not show.
             $this->setStep(WELCOME_FINISHED);
             return false;
+        } else if (empty($sec2) === true) {
+            // Pending tasks.
+            return true;
         }
 
         if ($this->step === WELCOME_FINISHED) {