[eGroupWare-svn] r23536 - in /trunk/workflow: doc/ inc/ inc/engine/src/API/ inc/engine/src/GUI/ inc/engine/src/common/ setup/

[<reg...@us...>]

Author: regis_leroy
Date: Tue Mar 27 09:58:23 2007
New Revision: 23536

URL: http://www.egroupware.org/viewvc?rev=3D3D23536&view=3D3Drev
Log:
fix bad version number update - Oscar Manuel Gomez Senovilla

Modified:
    trunk/workflow/doc/CHANGELOG
    trunk/workflow/inc/class.ui_admininstance.inc.php
    trunk/workflow/inc/engine/src/API/Instance.php
    trunk/workflow/inc/engine/src/GUI/GUI.php
    trunk/workflow/inc/engine/src/common/WfRuntime.php
    trunk/workflow/setup/tables_update.inc.php

Modified: trunk/workflow/doc/CHANGELOG
URL: http://www.egroupware.org/viewvc/trunk/workflow/doc/CHANGELOG?rev=3D3D=
23=3D
536&r1=3D3D23535&r2=3D3D23536&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/workflow/doc/CHANGELOG (original)
+++ trunk/workflow/doc/CHANGELOG Tue Mar 27 09:58:23 2007
@@ -9,6 +9,7 @@
 	* use processes.css to decorate process names in all listings
 	* integrate patch 1497085 new method gui_list_instance_by_owner by Mauric=
=3D
io Luiz Viani, integration with gui_list_user_instance
 	* patch 1533381 - Mauricio Luiz Viani- missing $ in GUI/gui_list_instance=
=3D
s_by_owner and missing space in gui_list_user_instances
+	* patch 495 - Oscar Manuel Gomez Senovilla : fix bad version upgrade
 =3D

 [1.2.01.007] bugfixes release ** LATEST STABLE RELEASE **
 	* fix bad synchro on Instance fields, especially on automatic and start a=
=3D
ctivities (regis_leroy)

Modified: trunk/workflow/inc/class.ui_admininstance.inc.php
URL: http://www.egroupware.org/viewvc/trunk/workflow/inc/class.ui_admininst=
=3D
ance.inc.php?rev=3D3D23536&r1=3D3D23535&r2=3D3D23536&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/workflow/inc/class.ui_admininstance.inc.php (original)
+++ trunk/workflow/inc/class.ui_admininstance.inc.php Tue Mar 27 09:58:23 2=
=3D
007
@@ -150,7 +150,7 @@
 			=3D

 			//now we use bo_uiinstance to display the form
 			$instance =3D3D& CreateObject('workflow.workflow_instance');
-			$instance->getInstance($iid);
+			$instance->loadInstance($iid);
 			$inst_parser	=3D3D& CreateObject('workflow.bo_uiinstance', $this->t);
 			//this is necessary the CreateObject did not use ref parameters
 			$inst_parser->t =3D3D& $this->t;

Modified: trunk/workflow/inc/engine/src/API/Instance.php
URL: http://www.egroupware.org/viewvc/trunk/workflow/inc/engine/src/API/Ins=
=3D
tance.php?rev=3D3D23536&r1=3D3D23535&r2=3D3D23536&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/workflow/inc/engine/src/API/Instance.php (original)
+++ trunk/workflow/inc/engine/src/API/Instance.php Tue Mar 27 09:58:23 2007
@@ -47,15 +47,33 @@
 =3D

   /*!
   * Method used to load an instance data from the database.
+  *
   * This function will load/initialize members of the instance object from=
=3D
 the database
   * it will populate all members and will by default populate the related =
=3D
activities array
   * and the workitems (history) array.
   * @param $instanceId
   * @param $load_activities true by default, do we need to reload activiti=
=3D
es from the database?
   * @param $load_workitems true by default, do we need to reload workitems=
=3D
 from the database?
+  * @deprecated deprecated since 1.3 see LoadInstanceFromDb instead
   */
   function getInstance($instanceId, $load_activities=3D3Dtrue, $load_worki=
te=3D
ms=3D3Dtrue) =3D

   {
+	trigger_error('Instance->getInstance is deprecated use loadInstance inste=
=3D
ad',E_USER_WARNING);
+	return loadInstance($instanceId, $load_activities, $load_workitems);
+  }
+
+  /*!
+  * Method used to load an instance data from the database.
+  *
+  * This function will load/initialize members of the instance object from=
=3D
 the database
+  * it will populate all members and will by default populate the related =
=3D
activities array
+  * and the workitems (history) array.
+  * @param $instanceId
+  * @param $load_activities true by default, do we need to reload activiti=
=3D
es from the database?
+  * @param $load_workitems true by default, do we need to reload workitems=
=3D
 from the database?
+  * @return true if everything was ok, false in the other case
+  */
+  function loadInstance($instanceId, $load_activities=3D3Dtrue, $load_work=
it=3D
ems=3D3Dtrue)
     if (!($instanceId)) return true; //start activities for example - pseu=
=3D
do instances
     // Get the instance data
     $query =3D3D "select * from `".GALAXIA_TABLE_PREFIX."instances` where =
`w=3D
f_instance_id`=3D3D?";
@@ -221,7 +239,7 @@
       $init_category =3D3D $this->category;
       // we re-read instance members to detect conflicts, changes made whi=
=3D
le we were unsynchronised
 		// TODO: there is instanceID and instance_id, all around that's bad!!!
-      $this->getInstance($this->instanceId, false, false);
+      $this->loadInstance($this->instanceId, false, false);
 	  =3D

       // Now for each modified field we'll change the database value if no=
=3D
body has changed
       // the database value before us

Modified: trunk/workflow/inc/engine/src/GUI/GUI.php
URL: http://www.egroupware.org/viewvc/trunk/workflow/inc/engine/src/GUI/GUI=
=3D
.php?rev=3D3D23536&r1=3D3D23535&r2=3D3D23536&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/workflow/inc/engine/src/GUI/GUI.php (original)
+++ trunk/workflow/inc/engine/src/GUI/GUI.php Tue Mar 27 09:58:23 2007
@@ -821,7 +821,7 @@
     {
       //the security object said everything was fine
       $instance =3D3D new Instance($this->db);
-      $instance->getInstance($instanceId);
+      $instance->loadInstance($instanceId);
       if (!empty($instance->instanceId)) =3D

       {
           if (!($instance->abort($activityId,$user)))
@@ -913,7 +913,7 @@
     {
       //the security object said everything was fine
       $instance =3D3D& new Instance($this->db);
-      $instance->getInstance($instanceId);
+      $instance->loadInstance($instanceId);
       // we force the execution of the activity
       $result =3D3D $instance->executeAutomaticActivity($activityId, $inst=
an=3D
ceId);      =3D

       //TODO handle information returned in the sendAutorouted like in the=
=3D
 completed activity template
@@ -949,7 +949,7 @@
     {
       //the security object said everything was fine
       $instance =3D3D& new Instance($this->db);
-      $instance->getInstance($instanceId);
+      $instance->loadInstance($instanceId);
       // we force the continuation of the flow
       $result =3D3D $instance->sendAutorouted($activityId,true);
       //TODO handle information returned in the sendAutorouted like in the=
=3D
 completed activity template

Modified: trunk/workflow/inc/engine/src/common/WfRuntime.php
URL: http://www.egroupware.org/viewvc/trunk/workflow/inc/engine/src/common/=
=3D
WfRuntime.php?rev=3D3D23536&r1=3D3D23535&r2=3D3D23536&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/workflow/inc/engine/src/common/WfRuntime.php (original)
+++ trunk/workflow/inc/engine/src/common/WfRuntime.php Tue Mar 27 09:58:23 =
=3D
2007
@@ -117,6 +117,7 @@
   /*! =3D

   * @private
   * load the config values for the process associated with the runtime
+  *
   * config values are cached while this WfRuntime object stays alive
   * @param $arrayconf is a config array with default value i.e.:
   *	* key is the config option name
@@ -138,8 +139,8 @@
 =3D

   /*!
   * @public
-  * Load the instance, the activity and the process, allthings needed by t=
=3D
he runtime engine
-  * to  'execute' the activity
+  * Load the instance, the activity and the process, all things needed by =
=3D
the runtime engine to 'execute' the activity
+  *
   * @param $activityId is the activity id, the activity we will run
   * @param $instanceId is the instance Id, can be empty for a start or sta=
=3D
ndalone activity
   * @return true or false
@@ -176,9 +177,10 @@
   /*!
   * @private
   * retrieve the process object associated with the activity
+  *
   * @param $pId is the process id of the process you want, if you do not g=
=3D
ive it we will try to
   * take it from the activity
-  * @return a Process Object of the right type or false
+  * @return true if everything was ok. False in the other case, consult er=
=3D
rors
   */
   function loadProcess($pId=3D3D0)
   {
@@ -201,17 +203,24 @@
     return true;
   }
   =3D

+  /*!
+  *
+  *
+  * @return the actual Process Object
+  */
   function &getProcess()
   {
     return $this->process;
   }
+  =3D

   /*!
   * @private
   * retrieve the activity of the right type from a baseActivity Object
+  *
   * @param $activity_id is the activity_id you want
   * @param $with_roles will load the roles links on the object
   * @param $with_agents will load the agents links on the object
-  * @return an Activity Object of the right type or false
+  * @return true if everything was ok. False in the other case, consult er=
=3D
rors
   */
   function loadActivity($activity_id, $with_roles=3D3D true,$with_agents=
=3D3Df=3D
alse)
   {
@@ -236,6 +245,11 @@
     return true;
   }
   =3D

+  /*!
+  * =3D

+  *
+  * @return the actual Activity Object
+  */
   function &getActivity()
   {
     return $this->activity;
@@ -245,12 +259,12 @@
   * @public
   * retrieve the instance which could be an empty object
   * @param $instanceId is the instance id
-  * @return an Instance Object which can be empty or or string if somethin=
=3D
g was turning bad
+  * @return true if everything was ok. False in the other case, consult er=
=3D
rors
   */
   function loadInstance($instanceId)
   {
     $this->instance_id =3D3D $instanceId;
-    $this->instance->getInstance($instanceId);
+    $this->instance->loadInstance($instanceId);
     if ( ($this->instance->getInstanceId()=3D3D=3D3D0) =3D

       && (! (($this->activity->getType()=3D3D=3D3D'standalone') || ($this-=
>act=3D
ivity->getType()=3D3D=3D3D'start') )) )
     {

Modified: trunk/workflow/setup/tables_update.inc.php
URL: http://www.egroupware.org/viewvc/trunk/workflow/setup/tables_update.in=
=3D
c=2Ephp?rev=3D3D23536&r1=3D3D23535&r2=3D3D23536&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/workflow/setup/tables_update.inc.php (original)
+++ trunk/workflow/setup/tables_update.inc.php Tue Mar 27 09:58:23 2007
@@ -381,7 +381,7 @@
 		}
 		=3D

 	$test[] =3D3D '1.2.01.007';
-        function workflow_upgrade1_3_00_000()
+        function workflow_upgrade1_2_01_007()
         {
                 #updating the current version
                 $GLOBALS['setup_info']['workflow']['currentver'] =3D3D '1.=
3=2E=3D
00.000';