[Gforge-commits] gforge/www/pm deletetask.php, NONE, 1.1 mod_task.php, 1.18, 1.19 task.php, 1.18, 1.19

[ruben]

Update of /cvsroot/gforge/gforge/www/pm
In directory db.perdue.net:/tmp/cvs-serv15734/www/pm

Modified Files:
        mod_task.php task.php 
Added Files:
        deletetask.php 
Log Message:
added option to delete a task or artifact

--- NEW FILE: deletetask.php ---
<?php
/**
 * GForge Project Management Facility
 *
 * Copyright 2002 GForge, LLC
 * http://gforge.org/
 *
 * @version   $Id: deletetask.php,v 1.1 2004/12/20 16:53:25 ruben Exp $
 */
/*

        Project/Task Manager
        By Tim Perdue, Sourceforge, 11/99
        Heavy rewrite by Tim Perdue April 2000

        Total rewrite in OO and GForge coding guidelines 12/2002 by Tim Perdue
*/

pm_header(array('title'=>$Language->getText('pm_deletetask','title'),'group_project_id'=>$group_project_id));

?>

<form action="<?php echo 
"$PHP_SELF?group_id=$group_id&amp;group_project_id=$group_project_id"; ?>" 
method="post">
<input type="hidden" name="func" value="postdeletetask" />
<input type="hidden" name="project_task_id" value="<?php echo $project_task_id; 
?>" />

<table border="0" align="center">

        <tr>
                <td align="center"><h3><font color="#FF0000"><?php echo 
$Language->getText('pm_deletetask','are_you_sure'); ?></font></h3>
                        <h3>&quot;<?php echo $pt->getSummary(); 
?>&quot;</h3></td>
        </tr>
        <tr align="center">
                <td align="center"><input type="checkbox" value="1" 
name="confirm_delete"> <?php echo 
$Language->getText('pm_deletetask','confirm'); ?></td>
        </tr>
        <tr>
                <td align="center"><input type="submit" value="<?php echo 
$Language->getText('general','submit'); ?>" name="submit" /></td>
        </tr>

</table>
</form>

<?php

pm_footer(array());

// Local Variables:
// mode: php
// c-file-style: "bsd"
// End:

?>

Index: mod_task.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/pm/mod_task.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mod_task.php        15 Dec 2004 21:04:39 -0000      1.18
+++ mod_task.php        20 Dec 2004 16:53:25 -0000      1.19
@@ -64,16 +64,16 @@
                <strong><?php echo $Language->getText('pm','priority') 
?>:</strong><br />
                <?php echo 
build_priority_select_box('priority',$pt->getPriority()); ?>
                </td>
-
-
-
        </tr>
 
        <tr>
-               <td colspan="2">
+               <td>
                <strong><?php echo $Language->getText('pm','summary') 
?>:</strong><br />
                <input type="text" name="summary" size="40" maxlength="65" 
value="<?php echo $pt->getSummary(); ?>" />
                </td>
+               <td>
+               <a href="<?php echo 
"$PHP_SELF?func=deletetask&amp;project_task_id=$project_task_id&amp;group_id=$group_id&amp;group_project_id=$group_project_id";
 ?>"><?php echo $Language->getText('pm_deletetask','delete') ?></a>
+               </td>
        </tr>
 
        <tr>

Index: task.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/pm/task.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- task.php    6 Dec 2004 21:07:21 -0000       1.18
+++ task.php    20 Dec 2004 16:53:25 -0000      1.19
@@ -205,31 +205,49 @@
        //
        case 'deletetask' : {
                if ($pg->userIsAdmin()) {
+                       $pt= new ProjectTask($pg,$project_task_id);
+                       if (!$pt || !is_object($pt)) {
+                               exit_error('Error','Could Not Get ProjectTask');
+                       } elseif ($pt->isError()) {
+                               exit_error('Error',$pt->getErrorMessage());
+                       }
                        include 'deletetask.php';
                } else {
                        exit_permission_denied();
                }
+               break;
        }
 
        //
        //      Handle the actual delete
        //
-       case 'deletetask' : {
+
+       case 'postdeletetask' : {
                if ($pg->userIsAdmin()) {
-                       $pt= new ProjectTask($pg,$project_task_id);
+                       $pt= new ProjectTask($pg, $project_task_id);
                        if (!$pt || !is_object($pt)) {
                                exit_error('Error','Could Not Get ProjectTask');
                        } elseif ($pt->isError()) {
-                               exit_error('Error',$pt->getErrorMessage());
+                               exit_error('Error', $pt->getErrorMessage());
                        }
-                       if (!$pt->delete()) {
-                               $feedback .= 'Delete failed: 
'.$pt->getErrorMessage();
-                       } else {
-                               $feedback .= 'Successfully Deleted';
+                       if (!$confirm_delete) {
+                               $feedback .= 
$Language->getText('pm_deletetask','task_delete_failed_confirm');
+                       }
+                       else {
+                               $deletion = $pt->delete(true);
+                               if (!$deletion) {
+                                       echo $deletion;
+                                       $feedback .= 
$Language->getText('pm_deletetask','task_delete_failed') . ': 
'.$pt->getErrorMessage();
+                               } else {
+                                       echo $deletion;
+                                       $feedback .= 
$Language->getText('pm_deletetask','task_deleted_successfully');
+                               }
                        }
+                       include 'browse_task.php';
                } else {
                        exit_permission_denied();
                }
+               break;
        }
 
        //