Resolved merge conflict.

[com.zyxware.civiwci.git] / wci.php

diff --git a/wci.php b/wci.php
index 005b1f8ec44955c9c973d69cbf9a77f0f7e8e158..1603bc035a59ff49e23280af2ad7b7146b30aa57 100644 (file)
--- a/wci.php
+++ b/wci.php
@@ -137,7 +137,7 @@ function wci_civicrm_navigationMenu( &$params ) {
         'permission' => 'access CiviReport,access CiviContribute',
         'operator' => 'OR',
         'separator' => 1,
-        'parentID' => navId, 
+        'parentID' => $navId, 
         'navID' => $navId+1,
         'active' => 1)),
         
@@ -145,11 +145,11 @@ function wci_civicrm_navigationMenu( &$params ) {
         'attributes' => array (
         'label' => ts('Manage widget'),
         'name' => 'manage_widget',
-        'url' => 'civicrm/wci/widget',
+        'url' => 'civicrm/wci/widget?reset=1',
         'permission' => 'access CiviReport,access CiviContribute',
         'operator' => 'OR',
         'separator' => 1,
-        'parentID' => navId, 
+        'parentID' => $navId, 
         'navID' => $navId+2,
         'active' => 1)),
         
@@ -161,7 +161,7 @@ function wci_civicrm_navigationMenu( &$params ) {
         'permission' => 'access CiviReport,access CiviContribute',
         'operator' => 'OR',
         'separator' => 1,
-        'parentID' => navId, 
+        'parentID' => $navId, 
         'navID' => $navId+3,
         'active' => 1)),
         
@@ -173,7 +173,7 @@ function wci_civicrm_navigationMenu( &$params ) {
         'permission' => 'access CiviReport,access CiviContribute',
         'operator' => 'OR',
         'separator' => 1,
-        'parentID' => navId, 
+        'parentID' => $navId, 
         'navID' => $navId+4,
         'active' => 1)),           
         ),