Merged in MT-115 (pull request #4074)

MT-115

workflow/engine/classes/class.licensedFeatures.php

@@ -282,6 +282,41 @@ class PMLicensedFeatures
                 "type"           => "features",
                 "url"            => "",
                 "version"        => ""
+            ),
+            15 => array(
+                "description" => "This Feature will allow to store all input, output and attached documents generated
+                 in your processes in Google Drive.",
+                "enabled" => false,
+                "id" => "pmGoogleDrive",
+                "latest_version" => "",
+                "log" => null,
+                "name" => "pmGoogleDrive",
+                "nick" => "pmGoogleDrive",
+                "progress" => 0,
+                "publisher" => "Colosa",
+                "release_type" => "localRegistry",
+                "status" => "ready",
+                "store" => "00000000000000000000000000010015",
+                "type" => "features",
+                "url" => "",
+                "version" => ""
+            ),
+            16 => array(
+                "description" => "Selective Import Export.",
+                "enabled" => false,
+                "id" => "selectiveImportExport",
+                "latest_version" => "",
+                "log" => null,
+                "name" => "selectiveImportExport",
+                "nick" => "selectiveImportExport",
+                "progress" => 0,
+                "publisher" => "Colosa",
+                "release_type" => "localRegistry",
+                "status" => "ready",
+                "store" => "00000000000000000000000000010016",
+                "type" => "features",
+                "url" => "",
+                "version" => ""
             )
         );
 

workflow/engine/data/mysql/insert.sql

@@ -61470,4 +61470,6 @@ INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADD
 ('SSO with an LDAP provider.','windowsSSO','windowsSSO','windowsSSO','Colosa','localRegistry','ready','00000000000000000000000000010011','features','','','0'),
 ('Integration with Gmail','pmGmail','pmGmail','pmGmail','Colosa','localRegistry','ready','00000000000000000000000000010012','features','','','0'),
 ('User-based Language Management.','userBasedLanguage','userBasedLanguage','userBasedLanguage','Colosa','localRegistry','ready','00000000000000000000000000010013','features','','','0'),
-('User-based Time Zone Management.','userBasedTimeZone','userBasedTimeZone','userBasedTimeZone','Colosa','localRegistry','ready','00000000000000000000000000010014','features','','','0');
+('User-based Time Zone Management.','userBasedTimeZone','userBasedTimeZone','userBasedTimeZone','Colosa','localRegistry','ready','00000000000000000000000000010014','features','','','0'),
+('This Feature will allow to store all input, output and attached documents generated in your processes in Google Drive.','pmGoogleDrive','pmGoogleDrive','pmGoogleDrive','Colosa','localRegistry','ready','00000000000000000000000000010015','features','','','0'),
+('Selective Import Export.','selectiveImportExport','selectiveImportExport','selectiveImportExport','Colosa','localRegistry','ready','00000000000000000000000000010016','features','','','0');

workflow/engine/methods/processes/mainInit.php

@@ -104,5 +104,14 @@ if(sizeof($callBackFile)) {
 }
 $oHeadPublisher->assign("importProcessCallbackFile", $file);
 
+$isGranularFeature = false;
+/*----------------------------------********---------------------------------*/
+$licensedFeatures = & PMLicensedFeatures::getSingleton();
+if ($licensedFeatures->verifyfeature('jXsSi94bkRUcVZyRStNVExlTXhEclVadGRRcG9xbjNvTWVFQUF3cklKQVBiVT0=')) {
+    $isGranularFeature = true;
+}
+/*----------------------------------********---------------------------------*/
+$oHeadPublisher->assign("isGranularFeature", $isGranularFeature);
+
 G::RenderPage( 'publish', 'extJs' );
 

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php

@@ -31,20 +31,25 @@ class GranularExporter
     public function export($objectList)
     {
         try {
-            $exportObject = new ExportObjects();
+            if (\PMLicensedFeatures::getSingleton()->verifyfeature
-            $objectList = $exportObject->mapObjectList($objectList);
+            ("jXsSi94bkRUcVZyRStNVExlTXhEclVadGRRcG9xbjNvTWVFQUF3cklKQVBiVT0=")
-            $this->beforeExport($objectList);
+            ) {
-            foreach ($objectList as $data) {
+                $exportObject = new ExportObjects();
-                $migrator = $this->factory->create($data);
+                $objectList = $exportObject->mapObjectList($objectList);
-                $migratorData = $migrator->export($this->prjuid);
+                $this->beforeExport($objectList);
-                $this->mergeData($migratorData);
+                foreach ($objectList as $data) {
+                    $migrator = $this->factory->create($data);
+                    $migratorData = $migrator->export($this->prjuid);
+                    $this->mergeData($migratorData);
+                }
+                return $this->publish();
+            } else {
+                $exception = new ExportException();
+                $exception->setNameException(\G::LoadTranslation('ID_NO_LICENSE_SELECTIVEIMPORTEXPORT_ENABLED'));
+                throw($exception);
             }
-            return $this->publish();
+        } catch (\Exception $e) {
-        } catch (ExportException $e) {
+            throw $e;
-            return array(
-                'success' => false,
-                'message' => $e->getMessage()
-            );
         }
     }
 

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php

@@ -161,26 +161,39 @@ class GranularImporter
     public function import($objectList)
     {
         try {
-            $objectList = $this->reorderImportOrder($objectList);
+            if (\PMLicensedFeatures::getSingleton()->verifyfeature
-            foreach ($objectList as $data) {
+            ("jXsSi94bkRUcVZyRStNVExlTXhEclVadGRRcG9xbjNvTWVFQUF3cklKQVBiVT0=")
-                $objClass = $this->factory->create($data['name']);
+            ) {
-                if (is_object($objClass)) {
+                $objectList = $this->reorderImportOrder($objectList);
-                    $dataImport = $data['data'][$data['name']];
+                foreach ($objectList as $data) {
-                    $replace = ($data['value'] == 'replace') ? true : false;
+                    $objClass = $this->factory->create($data['name']);
-                    $migratorData = $objClass->import($dataImport, $replace);
+                    if (is_object($objClass)) {
+                        $dataImport = $data['data'][$data['name']];
+                        $replace = ($data['value'] == 'replace') ? true : false;
+                        $migratorData = $objClass->import($dataImport, $replace);
+                    }
                 }
+            } else {
+                $exception = new ImportException();
+                $exception->setNameException(\G::LoadTranslation('ID_NO_LICENSE_SELECTIVEIMPORTEXPORT_ENABLED'));
+                throw($exception);
             }
+
         } catch (\Exception $e) {
-            $exception = new ImportException('Please review your current process definition
+            if (get_class($e) === 'ProcessMaker\BusinessModel\Migrator\ImportException') {
+                throw $e;
+            } else {
+                $exception = new ImportException('Please review your current process definition
                 for missing elements, it\'s recommended that a new process should be exported
                 with all the elements.');
-            throw $exception;
+                throw $exception;
+            }
         }
     }
 
     /**
      * @param $objectList
-     * @param bool $generateUid
+     * @param $option
      * @return bool
      * @throws \Exception
      */

workflow/engine/src/ProcessMaker/Services/Api/System.php

@@ -66,7 +66,8 @@ class System extends Api
             $enabledFeatures = array();
             /*----------------------------------********---------------------------------*/
             $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=',
-                'oq3S29xemxEZXJpZEIzN01qenJUaStSekY4cTdJVm5vbWtVM0d4S2lJSS9qUT0=');
+                'oq3S29xemxEZXJpZEIzN01qenJUaStSekY4cTdJVm5vbWtVM0d4S2lJSS9qUT0=',
+                'jXsSi94bkRUcVZyRStNVExlTXhEclVadGRRcG9xbjNvTWVFQUF3cklKQVBiVT0=');
             foreach ($keys as $key) {
                 if (\PMLicensedFeatures
                     ::getSingleton()

workflow/engine/templates/processes/main.js

@@ -251,7 +251,7 @@ Ext.onReady(function(){
     //Code export - exportGranular (handle)
     var exportProcessOption;
     /*----------------------------------********---------------------------------*/
-    if (true) {
+    if (isGranularFeature) {
         exportProcessOption = {
             xtype: "tbsplit",
             id: "export",
@@ -532,7 +532,7 @@ Ext.onReady(function(){
     //code export - exportGranular (handler)
     var menuExportOption;
     /*----------------------------------********---------------------------------*/
-    if (true) {
+    if (isGranularFeature) {
         menuExportOption = {
             text: _("ID_EXPORT"),
             icon: "/images/export.png",