Merge remote branch 'upstream/master'

workflow/engine/classes/class.calendar.php

@@ -414,7 +414,7 @@ class calendar extends CalendarDefinition
     			$hoursDuration -= (float)($secondRes/3600);
     			//$dataLog[] = (float)($secondRes/3600);
     		} else {
-    			$newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate)));
+          $newDate = date("Y-m-d H:i:s", strtotime("+" . round(((float)($hoursDuration)) * 3600) . " seconds", strtotime($newDate)));
     			//$dataLog[] = (float)($hoursDuration);
     			$hoursDuration = 0;
     		}
@@ -797,4 +797,4 @@ class calendar extends CalendarDefinition
     }
 
 }
-?>
+?>

workflow/engine/classes/class.processes.php

@@ -1516,9 +1516,20 @@ class Processes
     {
         foreach ($SubProcess as $key => $row) {
             $oSubProcess = new SubProcess();
-            if ($oSubProcess->subProcessExists( $row['SP_UID'] )) {
-                $oSubProcess->remove( $row['SP_UID'] );
-            }
+
+            //if ($oSubProcess->subProcessExists( $row['SP_UID'] )) {
+            //    $oSubProcess->remove( $row['SP_UID'] );
+            //}
+
+            //Delete
+            $criteria = new Criteria("workflow");
+
+            $criteria->add(SubProcessPeer::PRO_PARENT, $row["PRO_PARENT"], Criteria::EQUAL);
+            $criteria->add(SubProcessPeer::TAS_PARENT, $row["TAS_PARENT"], Criteria::EQUAL);
+
+            $result = SubProcessPeer::doDelete($criteria);
+
+            //Create
             $res = $oSubProcess->create( $row );
         }
         return;

workflow/engine/classes/model/OutputDocument.php

@@ -201,7 +201,7 @@ class OutputDocument extends BaseOutputDocument
                 }
                 $description .= ", By clicking on the generated file link: ".$genLink;
                 G::auditLog("CreateOutputDocument", $description);
-              
+
                 return $aData['OUT_DOC_UID'];
             } else {
                 $sMessage = '';
@@ -329,9 +329,11 @@ class OutputDocument extends BaseOutputDocument
                 Content::removeContent('OUT_DOC_TEMPLATE', '', $oOutputDocument->getOutDocUid());
                 $iResult = $oOutputDocument->delete();
                 $oConnection->commit();
-                //Add Audit Log                
-                G::auditLog("DeleteOutputDocument", "Output Document Name: ".$outputName.", Output Document Uid: ".$sOutDocUid.", Description: ".$outputDesc.", Filename generated: ".$outputFile);
 
+                //Add Audit Log
+                G::auditLog("DeleteOutputDocument", "Output Document Name: " . $oOutputDocument->getOutDocTitle() . ", Output Document Uid: " . $sOutDocUid . ", Description: " . $oOutputDocument->getOutDocDescription() . ", Filename generated: " . $oOutputDocument->getOutDocFilename());
+
+                //Return
                 return $iResult;
             } else {
                 throw (new Exception('This row doesn\'t exist!'));
@@ -845,7 +847,7 @@ class OutputDocument extends BaseOutputDocument
         $sContent = str_ireplace("</font>", "</span>", $sContent);
 
         $sContent = str_replace($nrthtml, $nrt, $sContent);
-        
+
         $sContent = str_replace("margin-left", "text-indent", $sContent);
 
         // define Save file

workflow/engine/classes/model/Triggers.php

@@ -189,7 +189,7 @@ class Triggers extends BaseTriggers
                   $description .= ", Description: ".$aData['TRI_DESCRIPTION'];
                 }
                 G::auditLog("CreateTrigger", $description);
-                
+
                 return $result;
             } else {
                 $con->rollback();
@@ -240,18 +240,14 @@ class Triggers extends BaseTriggers
             $con->begin();
             $oTri = TriggersPeer::retrieveByPK( $TriUid );
             if (!is_null($oTri)) {
-                $triggerName = $this->getTriTitle();
-                $triggerDesc = $this->getTriDescription();
-                Content::removeContent( 'TRI_TITLE', '', $this->getTriUid());
-                Content::removeContent( 'TRI_DESCRIPTION', '', $this->getTriUid());
+                Content::removeContent("TRI_TITLE", "", $TriUid);
+                Content::removeContent("TRI_DESCRIPTION", "", $TriUid);
+
                 $result = $oTri->delete();
                 $con->commit();
+
                 //Add Audit Log
-                $description = "Trigger Name: ".$triggerName.", Trigger Uid: ".$TriUid;
-                if (isset ( $triggerDesc )) {
-                  $description .= ", Description: ".$triggerDesc;
-                }
-                G::auditLog("DeleteTrigger", $description);
+                G::auditLog("DeleteTrigger", "Trigger Name: " . $oTri->getTriTitle() . ", Trigger Uid: " . $TriUid . ", Description: " . $oTri->getTriDescription());
             }
             return $result;
         } catch (Exception $e) {

workflow/engine/src/ProcessMaker/Project/Workflow.php

@@ -764,6 +764,13 @@ class Workflow extends Handler
             $oCriteria->add(\CaseTrackerObjectPeer::PRO_UID, $sProcessUID);
             \ProcessUserPeer::doDelete($oCriteria);
 
+            //Delete SubProcess
+            $criteria = new \Criteria("workflow");
+
+            $criteria->add(\SubProcessPeer::PRO_PARENT, $sProcessUID, \Criteria::EQUAL);
+
+            $result = \SubProcessPeer::doDelete($criteria);
+
             //Delete WebEntries
             $webEntry = new \ProcessMaker\BusinessModel\WebEntry();
 

workflow/engine/templates/cases/open.js

@@ -30,7 +30,15 @@ function formatAMPM(date, initVal) {
   minutes = minutes < 10 ? '0'+minutes : minutes;
   var strTime = hours + ':' + minutes + ' ' + ampm;
   return strTime;
-}
+};
+
+function isBrowserIE(){
+  if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ){
+   return true;
+   } else {
+     return false;
+   }
+};
 
 Ext.onReady(function(){
   openToRevisePanel = function() {
@@ -1531,20 +1539,24 @@ Ext.onReady(function(){
 	                  TabPanel.setActiveTab(tabId);
 	                }
 	                else {
-                            TabPanel.add({
-                                id: tabId,
-                                title: menuSelectedTitle[name],
-                                frameConfig: {name: name + 'Frame', id: name + 'Frame'},
-                                defaultSrc: uri,
-                                loadMask: {msg: _('ID_LOADING_GRID') + '...'},
-                                autoWidth: true,
-                                closable: true,
-                                autoScroll: true,
-                                bodyStyle: {height: (PMExt.getBrowser().screen.height - 60) + 'px', overflow: 'auto'}
-                            }).show();
+                    if(!isBrowserIE()){
+                      TabPanel.add({
+                          id: tabId,
+                          title: menuSelectedTitle[name],
+                          frameConfig: {name: name + 'Frame', id: name + 'Frame'},
+                          defaultSrc: uri,
+                          loadMask: {msg: _('ID_LOADING_GRID') + '...'},
+                          autoWidth: true,
+                          closable: true,
+                          autoScroll: true,
+                          bodyStyle: {height: (PMExt.getBrowser().screen.height - 60) + 'px', overflow: 'auto'}
+                      }).show();
 
-                            TabPanel.doLayout();
-	                }
+                      TabPanel.doLayout();
+                    }else{
+                      var windContainer = window.open(uri,"winContainer");
+                    }
+	              }
 	            }
 	          },
 	          failure: function ( result, request) {