From e2efd9c4bc118085d3d124d2be99a3d47f65d3b1 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Mon, 23 Mar 2015 21:13:03 -0400
Subject: [PATCH] PM-1531 "ProcessMaker 3.0 && 2.9  Enterprise and
 Community..." SOLVED

Issue:
    ProcessMaker 3.0 && 2.9  Enterprise and Community editions release generation
Cause:
    Ninguna
Solution:
    - Si la version es >= 3 solo se muestra la opcion "New BPMN Project"
    - Si la version es < 3  solo se muestra la opcion "New Project"
---
 .../engine/methods/processes/mainInit.php     |  9 ++--
 workflow/engine/templates/processes/main.js   | 50 ++++++++++++-------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/workflow/engine/methods/processes/mainInit.php b/workflow/engine/methods/processes/mainInit.php
index 45b9f4ff7..3e8a3ad0c 100755
--- a/workflow/engine/methods/processes/mainInit.php
+++ b/workflow/engine/methods/processes/mainInit.php
@@ -35,10 +35,12 @@ if (preg_match("/^([\d\.]+).*$/", System::getVersion(), $arrayMatch)) {
     $pmVersion = ""; //Branch master
 }
 
-$arrayPmFileExtension = array("pm", "pmx", "bpmn");
+$arrayImportFileExtension = array("pm", "pmx", "bpmn");
+$arrayMenuNewOption       = array("pm" => true, "bpmn" => true);
 
 if ($pmVersion != "") {
-    $arrayPmFileExtension = (version_compare($pmVersion . "", "3", ">="))? $arrayPmFileExtension : array("pm");
+    $arrayImportFileExtension = (version_compare($pmVersion . "", "3", ">="))? $arrayImportFileExtension : array("pm");
+    $arrayMenuNewOption       = (version_compare($pmVersion . "", "3", ">="))? array("bpmn" => true) : array("pm" => true);
 }
 
 $oHeadPublisher->addExtJsScript( 'processes/main', true ); //adding a javascript file .js
@@ -47,6 +49,7 @@ $oHeadPublisher->addContent( 'processes/main' ); //adding a html file  .html.
 $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
 $oHeadPublisher->assign( 'PARTNER_FLAG', $partnerFlag );
 $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
-$oHeadPublisher->assign("arrayPmFileExtension", $arrayPmFileExtension);
+$oHeadPublisher->assign("arrayImportFileExtension", $arrayImportFileExtension);
+$oHeadPublisher->assign("arrayMenuNewOption", $arrayMenuNewOption);
 
 G::RenderPage( 'publish', 'extJs' );
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index f58f82c61..65dbbfc55 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -175,6 +175,37 @@ Ext.onReady(function(){
     emptyMsg: "",
     items:[_('ID_PAGE_SIZE')+':',comboPageSize]
   })  */
+
+  var mnuNewBpmnProject = {
+      text: "New BPMN Project",
+      iconCls: "silk-add",
+      icon: "",
+      handler: function ()
+      {
+          newProcess({type:"bpmnProject"});
+      }
+  };
+
+  var mnuNewProject = {
+      text: "New Project",
+      iconCls: "silk-add",
+      icon: "",
+      handler: function ()
+      {
+          newProcess({type: "classicProject"});
+      }
+  };
+
+  var arrayMenuNew = [];
+
+  if (typeof(arrayMenuNewOption["bpmn"]) != "undefined") {
+      arrayMenuNew.push(mnuNewBpmnProject);
+  }
+
+  if (typeof(arrayMenuNewOption["pm"]) != "undefined") {
+      arrayMenuNew.push(mnuNewProject);
+  }
+
   processesGrid = new Ext.grid.GridPanel( {
     region: 'center',
     layout: 'fit',
@@ -245,24 +276,7 @@ Ext.onReady(function(){
         xtype: 'tbsplit',
         text: _('ID_NEW'),
         iconCls: 'button_menu_ext ss_sprite ss_add',
-        menu: [
-            {
-                text: "New BPMN Project",
-                iconCls: 'silk-add',
-                icon: '',
-                handler: function () {
-                    newProcess({type:"bpmnProject"});
-                }
-            },
-            {
-                text: "New Project",
-                iconCls: 'silk-add',
-                icon: '',
-                handler: function () {
-                    newProcess({type:"classicProject"});
-                }
-            }
-        ],
+        menu: arrayMenuNew,
         listeners: {
             "click": function (obj, e) {
                 obj.showMenu();