fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 6738 Deleting the initial with a case scheduler causes an error

Browse Source 
this issue has been fixed, now you can delete a task.
This commit is contained in:
Carlos Pacha
2011-04-15 16:51:33 -04:00
parent 030418cb7a
commit c31ee9c6fe
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.tasks.php
View File

@@ -378,6 +378,10 @@ class Tasks
ObjectPermissionPeer::doDelete($oCriteria); ObjectPermissionPeer::doDelete($oCriteria);
//Delete task //Delete task
$oTask->remove($sTaskUID); $oTask->remove($sTaskUID);
//Delete cases schedulers added by krlos
$oCriteria = new Criteria('workflow');
$oCriteria->add(CaseSchedulerPeer::TAS_UID, $sTaskUID);
CaseSchedulerPeer::doDelete($oCriteria);
} }
catch (Exception $oError) { catch (Exception $oError) {
throw($oError); throw($oError);
@@ -851,4 +855,4 @@ class Tasks
} }
} }
?> ?>

4
workflow/engine/js/processmap/core/processmap.js
View File

@@ -1457,7 +1457,7 @@ var processmap=function(){
{image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_TASK,launch:this.parent.closure({instance:this,method:function(index){ {image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_TASK,launch:this.parent.closure({instance:this,method:function(index){
var data = this.data.db.task[index]; var data = this.data.db.task[index];
new this.parent.module.app.confirm().make({ new this.parent.module.app.confirm().make({
label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+data.label, label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+ data.label,
action:function() action:function()
{ {
data.object.drag.flush(); data.object.drag.flush();
@@ -1472,7 +1472,7 @@ var processmap=function(){
}.extend(this) }.extend(this)
}); });
return; return;
if(confirm(G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+data.label)) if(confirm(G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+ data.label))
{ {
data.object.drag.flush(); data.object.drag.flush();
this.dropables.derivation.unregister(data.object.dropIndex); this.dropables.derivation.unregister(data.object.dropIndex);

3
workflow/engine/xmlform/cases/cases_Scheduler_New.html
View File

@@ -158,6 +158,7 @@
{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/> {$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
@@ -222,7 +223,7 @@
<tr> <tr>
<td class="FormButton" colspan="2" align="">{$form.BTNCANCEL}&nbsp;&nbsp;{$form.SAVE}</td> <td class="FormButton" colspan="2" align="">{$form.SAVE}&nbsp;&nbsp;{$form.BTNCANCEL}</td>
</tr> </tr>
</tbody></table> </tbody></table>
</td> </td>