From e09bba3706fabf33f342b4e0fbc9b93988a478ce Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <erik@colosa.com>
Date: Tue, 12 Jul 2011 12:32:14 -0400
Subject: [PATCH] BUG 0000 PM tables imporovements

- Setting order to available fields on report table edit UI
---
 workflow/engine/controllers/pmTables.php        |  4 +++-
 workflow/engine/controllers/pmTablesProxy.php   | 10 ++++++----
 .../engine/js/processmap/core/processmap.js     |  2 +-
 workflow/engine/templates/pmTables/list.js      | 17 ++++++++++-------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php
index 9ef3c9571..1f0b1d9dc 100644
--- a/workflow/engine/controllers/pmTables.php
+++ b/workflow/engine/controllers/pmTables.php
@@ -84,6 +84,7 @@ class pmTables extends Controller
               );
             }
           }
+          sort($fieldsList);
           $this->setJSVar('avFieldsList', $fieldsList);
           $repTabPluginPermissions = $this->_getSimpleReportPluginDef();
           $this->setJSVar('_plugin_permissions', $repTabPluginPermissions);
@@ -103,7 +104,7 @@ class pmTables extends Controller
               );
             }
           }
-
+          sort($fieldsList);
           $this->setJSVar('avFieldsList', $fieldsList);
           $repTabPluginPermissions = $this->_getSimpleReportPluginDef();
           break;
@@ -189,3 +190,4 @@ class pmTables extends Controller
 
 }
 
+
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index 339b2d761..c3c260fc3 100644
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -134,7 +134,7 @@ class pmTablesProxy extends HttpProxyController
           );
         }
       }
-      $resultList['processFields'] = $aProcessGridFields;
+      $resultList = $aProcessGridFields;
 
     } else {
       $aProcessFields = Array();
@@ -146,10 +146,12 @@ class pmTablesProxy extends HttpProxyController
           'FIELD_NAME' => $dfield['name']
         );
       }
-      $resultList['processFields'] = $aProcessFields;
+      $resultList = $aProcessFields;
     }
+    
+    sort($resultList);
 
-    return $resultList;
+    return array('processFields'=>$resultList);
   }
 
   /**
@@ -936,4 +938,4 @@ class aTablesMap{
     $this->aMap[$item] = $equal;
   }
   
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index 288421d8b..b69fa4286 100644
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -161,7 +161,7 @@ var processmap=function(){
                 panel.clearContent();
                 var iframe=document.createElement('iframe');
                 iframe.setAttribute('id','reportTablesIframe');
-                iframe.src = '../reportTables/main?PRO_UID=' + this.options.uid;
+                iframe.src = '../pmTables?PRO_UID=' + this.options.uid;
                 iframe.style.border='0px';
                 iframe.style.width='786px';
                 iframe.style.height='564px';
diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js
index 155f639f9..dfac133c7 100644
--- a/workflow/engine/templates/pmTables/list.js
+++ b/workflow/engine/templates/pmTables/list.js
@@ -38,15 +38,18 @@ Ext.onReady(function(){
 
     pageSize = parseInt(CONFIG.pageSize);
 
-    var newMenuOptions = [
-      {
+    var newMenuOptions = new Array();
+    if (PRO_UID == false) {
+      newMenuOptions.push({
         text: 'New Table',
         handler: newPMTable
-      }, {
-        text: 'New Report Table',
-        handler: NewReportTable
-      }
-    ];
+      });
+    }
+    
+    newMenuOptions.push({
+      text: 'New Report Table',
+      handler: NewReportTable
+    });
 
     if (PRO_UID !== false) {
       newMenuOptions.push({