From 34cdc338d133c6fb232039bf5194cbd0d19b82d3 Mon Sep 17 00:00:00 2001
From: Gustavo Adolfo Cruz Laura <gustavo.cruz@processmaker.com>
Date: Wed, 30 Mar 2016 17:27:51 -0400
Subject: [PATCH] Fix the old ui for consistency.

---
 .../BusinessModel/Migrator/ExportObjects.php     | 16 ++++++++++++++++
 .../BusinessModel/Migrator/GranularImporter.php  | 10 ++++++----
 workflow/engine/templates/processes/main.js      | 11 ++++++++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php
index 56c083e60..92e21f489 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php
@@ -23,6 +23,22 @@ class ExportObjects
         'Supervisors Objects'
     );
 
+    /**
+     * @return array
+     */
+    public function getObjectsList()
+    {
+        return $this->objectsList;
+    }
+
+    /**
+     * @param array $objectsList
+     */
+    public function setObjectsList($objectsList)
+    {
+        $this->objectsList = $objectsList;
+    }
+
     /**
      * @param string $objectsEnable
      * @return mixed|string
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
index e67dc37d9..3cf266b86 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
@@ -20,6 +20,7 @@ class GranularImporter
     {
         $this->factory = new MigratorFactory();
         $this->bpmn = new Adapter\BpmnWorkflow();
+        $this->exportObjects = new ExportObjects();
     }
 
     /**
@@ -31,10 +32,10 @@ class GranularImporter
     public function loadObjectsListSelected($data, $aGranular)
     {
         $listObjectGranular = array();
-        $exportObjects = new ExportObjects();
+        $this->exportObjects = new ExportObjects();
         //create structure
         foreach ($aGranular as $key => $rowObject) {
-            array_push($listObjectGranular, array("name" => strtoupper($exportObjects->getObjectName
+            array_push($listObjectGranular, array("name" => strtoupper($this->exportObjects->getObjectName
             ($rowObject->id)), "data" => "", "value" => $rowObject->action));
         }
         //add data
@@ -181,10 +182,11 @@ class GranularImporter
     public function validateImportData($objectList, $generateUid = false)
     {
         try {
+
             if ($generateUid) {
-                if(count($objectList) !== 14){
+                if (count($objectList) !== count($this->exportObjects->getObjectsList())) {
                     $exception = new ImportException();
-                    $exception->setNameException('To create a new process needs PROCESSDEFINITION');
+                    $exception->setNameException(\G::LoadTranslation('ID_PROCESS_DEFINITION_NON_EXISTENT'));
                     throw($exception);
                 }
             }
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index 431584d92..e47261649 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -362,11 +362,16 @@ Ext.onReady(function(){
         text: _("ID_EXPORT"),
         iconCls: "silk-add",
         icon: "/images/export.png",
-        handler: function () {
-          exportProcess();
-        },
         menu: [
           {
+              text: _("ID_NORMAL_EXPORT"),
+              iconCls: "silk-add",
+              icon: "",
+              handler: function ()
+              {
+                exportProcess();
+              }
+          }, {
             text: _("ID_GRANULAR_EXPORT"),
             iconCls: "silk-add",
             icon: "",