From 81699e932005bc7af76432765df2aa23b23e219c Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Thu, 1 Mar 2012 16:27:26 -0400
Subject: [PATCH] BUG 000 Improvements in the additional fields in the daslhets

---
 workflow/engine/controllers/dashboard.php     |  6 +--
 .../dashboard/dashletInstanceForm.js          | 44 ++++++++++++++-----
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index d4a7d3428..fdf5522f9 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -114,7 +114,7 @@ class Dashboard extends Controller {
       if ($data->DAS_INS_UID != '') {
         $this->pmDashlet->setup($data->DAS_INS_UID);
         $this->setJSVar('dashletInstance', $this->pmDashlet->getDashletInstance());
-        $this->setJSVar('additionaFields', PMDashlet::getAdditionalFields(get_class($this->pmDashlet->getDashletObject())));
+        $this->setJSVar('additionalFields', PMDashlet::getAdditionalFields(get_class($this->pmDashlet->getDashletObject())));
       }
       else {
         $dashletInstance = new stdclass();
@@ -122,7 +122,7 @@ class Dashboard extends Controller {
         $dashlet = new Dashlet();
         $dashletFields = $dashlet->load($dashletInstance->DAS_UID);
         $this->setJSVar('dashletInstance', $dashletInstance);
-        $this->setJSVar('additionaFields', PMDashlet::getAdditionalFields($dashletFields['DAS_CLASS']));
+        $this->setJSVar('additionalFields', PMDashlet::getAdditionalFields($dashletFields['DAS_CLASS']));
       }
       G::RenderPage('publish', 'extJs');
       return null;
@@ -175,7 +175,7 @@ class Dashboard extends Controller {
       $dashlet = new Dashlet();
       $dashletFields = $dashlet->load($data->DAS_UID);
       if (!is_null($dashletFields)) {
-        $result->additionaFields = PMDashlet::getAdditionalFields($dashletFields['DAS_CLASS']);
+        $result->additionalFields = PMDashlet::getAdditionalFields($dashletFields['DAS_CLASS']);
       }
       else {
         throw new Exception('Dashlet "' . $data->DAS_UID . '" not exists.');
diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js
index d150e7570..ab8ae47d1 100644
--- a/workflow/engine/templates/dashboard/dashletInstanceForm.js
+++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js
@@ -79,29 +79,29 @@ Ext.onReady(function() {
              params:   {DAS_UID: this.getValue()},
              success:  function (result, request) {
                          var response = Ext.util.JSON.decode(result.responseText)
-                         additionaFields = response.additionaFields;
+                         additionalFields = response.additionalFields;
                          dashletInstanceFrm.remove('additional');
-                         if (additionaFields.length > 0) {
-                           for (var i = 0; i < additionaFields.length; i++) {
-                             for (var listener in additionaFields[i].listeners) {
+                         if (additionalFields.length > 0) {
+                           for (var i = 0; i < additionalFields.length; i++) {
+                             for (var listener in additionalFields[i].listeners) {
                                try {
-                                 eval('additionaFields[i].listeners.' + listener + ' = eval(additionaFields[i].listeners.' + listener + ');');
+                                 eval('additionalFields[i].listeners.' + listener + ' = eval(additionalFields[i].listeners.' + listener + ');');
                                } catch (e) {}
                              }
                            }
                            dashletInstanceFrm.add(new Ext.form.FieldSet({
                              id:    'additional',
                              title: 'Other',
-                             items: additionaFields
+                             items: additionalFields
                            }));
                          }
                          dashletInstanceFrm.doLayout(false, true);
                          // Execute after render scripts
-                         if (additionaFields.length > 0) {
-                           for (var i = 0; i < additionaFields.length; i++) {
-                             if (typeof(additionaFields[i]._afterRender) != 'undefined') {
+                         if (additionalFields.length > 0) {
+                           for (var i = 0; i < additionalFields.length; i++) {
+                             if (typeof(additionalFields[i]._afterRender) != 'undefined') {
                                try {
-                                 eval(additionaFields[i]._afterRender);
+                                 eval(additionalFields[i]._afterRender);
                                } catch (e) {}
                              }
                            }
@@ -161,11 +161,20 @@ Ext.onReady(function() {
     })
   ];
 
-  if (additionaFields.length > 0) {
+  if (additionalFields.length > 0) {
+    if (additionalFields.length > 0) {
+      for (var i = 0; i < additionalFields.length; i++) {
+        for (var listener in additionalFields[i].listeners) {
+          try {
+            eval('additionalFields[i].listeners.' + listener + ' = eval(additionalFields[i].listeners.' + listener + ');');
+          } catch (e) {}
+        }
+      }
+    }
     formFields.push(new Ext.form.FieldSet({
       id:    'additional',
       title: 'Other',
-      items: additionaFields
+      items: additionalFields
     }));
   }
 
@@ -230,4 +239,15 @@ Ext.onReady(function() {
 
   // Render
   dashletInstanceFrm.render(document.body);
+
+  // Execute after render scripts
+  if (additionalFields.length > 0) {
+    for (var i = 0; i < additionalFields.length; i++) {
+      if (typeof(additionalFields[i]._afterRender) != 'undefined') {
+        try {
+          eval(additionalFields[i]._afterRender);
+        } catch (e) {}
+      }
+    }
+  }
 });