Changeset 6213

Timestamp:

07/30/08 11:15:42 (5 years ago)

Author:

p_lindheimer

Message:

fixes #2973 was not including the javascript functions to enable/disable the vm and vmx fields

Files:

• modules/branches/2.5/voicemail/functions.inc.php (modified) (4 diffs)
• modules/branches/2.5/voicemail/module.xml (modified) (1 diff)

modules/branches/2.5/voicemail/functions.inc.php

@@ -238 +238 @@
-
-       // We only want to hook 'users' or 'extensions' pages. 
-
+{
-    return true; 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    // JS function needed for checking voicemail = Enabled
-    $js = 'return (theForm.vm.value == "enabled");';
@@ -283 +274 @@
-    ";
-    $currentcomponent->addjsfunc('voicemailEnabled(notused)', $js);
-
+
-    $js = "
-      if (document.getElementById('vmx_state').value == 'checked') {
@@ -305 +296 @@
-      document.getElementById('vmx_option_1_number').disabled=dval;
-      document.getElementById('vmx_option_2_number').disabled=dval;
-
+
-      if (document.getElementById('vm').value == 'disabled') {
-        document.getElementById('vmx_option_0_number').disabled = true;
@@ -336 +327 @@
-    ";
-    $currentcomponent->addjsfunc('vmx_disable_fields(notused)', $js);
+  }
+
+  // On a 'new' user, 'tech_hardware' is set, and there's no extension. Hook into the page. 
+  if ($tech_hardware != null ) { 
+    voicemail_applyhooks(); 
+  } elseif ($action=="add") { 
+  // We don't need to display anything on an 'add', but we do need to handle returned data. 
+    // ** WARNING **
+    // Mailbox must be processed before adding / deleting users, therefore $sortorder = 1
+    $currentcomponent->addprocessfunc('voicemail_configprocess', 1);
+  } elseif ($extdisplay != '' || $pagename == 'users') { 
+  // We're now viewing an extension, so we need to display _and_ process. 
+    voicemail_applyhooks(); 
+    $currentcomponent->addprocessfunc('voicemail_configprocess', 1);
-  } 
-}

modules/branches/2.5/voicemail/module.xml

@@ -2 +2 @@
-  <rawname>voicemail</rawname>
-  <name>Voicemail</name>
-
+.1
-  <candisable>no</candisable>
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.5.0.1* #2973 enable javascript to enable/disable voicemail and vmx fields when creating extension
-    *2.5.0* #2754, #2903, #2785, #2647, #2593 Added VmX config, added O extension config, better javascript interactions
-    *2.4.0.1* added depends on 2.4.0