Merge lp:~andersdd/eventum/edit-reporter into lp:eventum

[Dave Anderson]

Adds a simple screen on the issue page for amending the reporter. This is useful for email created issues where the email address is unknown and the issue is created with the user "system" . The screen logs who made the change in the issue history.

[lp:~andersdd/eventum/edit-reporter]

4452. By Elan Ruusamäe on 2012-01-03

scm/eventum-cvs-hook: support CVS 1.11 and 1.12 formats (autodetected if configured correctly) (Elan Ruusamäe)

4453. By Elan Ruusamäe on 2012-01-03

fix cronjobs erroneously report removed lock files. Fixes #904033

4454. By Elan Ruusamäe on 2012-01-03

Add a simple screen on the issue page for amending the reporter. (Elan Ruusamäe, Dave Anderson)

[Elan Ruusamäe (glen666)]

this has a little problem, when saving reporter to email which does not have account in system, it displays the reporter area as blank.

it should keep eventum system account in such cases

review: Needs Resubmitting

[Dave Anderson (andersdd)]

Thanks - missed that in testing. Have now fixed the problem as suggested.

Also added automatic addition of edited reporter to notification list

=== added file 'htdocs/edit_reporter.php'
--- htdocs/edit_reporter.php	1970-01-01 00:00:00 +0000
+++ htdocs/edit_reporter.php	2011-12-14 10:15:29 +0000
@@ -0,0 +1,48 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
+// +----------------------------------------------------------------------+
+// | Eventum - Issue Tracking System                                      |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 2003 - 2008 MySQL AB                                   |
+// | Copyright (c) 2008 - 2010 Sun Microsystem Inc.                       |
+// |                                                                      |
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation; either version 2 of the License, or    |
+// | (at your option) any later version.                                  |
+// |                                                                      |
+// | This program is distributed in the hope that it will be useful,      |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+// | GNU General Public License for more details.                         |
+// |                                                                      |
+// | You should have received a copy of the GNU General Public License    |
+// | along with this program; if not, write to:                           |
+// |                                                                      |
+// | Free Software Foundation, Inc.                                       |
+// | 59 Temple Place - Suite 330                                          |
+// | Boston, MA 02111-1307, USA.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Bryan Alsdorf <[e-mail]>                             |
+// +----------------------------------------------------------------------+
+
+require_once dirname(__FILE__) . '/../init.php';
+
+$tpl = new Template_Helper();
+$tpl->setTemplate("edit_reporter.tpl.html");
+
+Auth::checkAuthentication(APP_COOKIE, 'index.php?err=5', true);
+
+$prj_id = Auth::getCurrentProject();
+$issue_id = @$_POST["issue_id"] ? $_POST["issue_id"] : $_GET["iss_id"];
+$tpl->assign("issue_id", $issue_id);
+
+if (@$_POST["cat"] == "update") {
+    $res = Edit_Reporter::update($issue_id, $_POST['email']);
+    $tpl->assign("insert_result", $res);
+}
+
+$t = Project::getAddressBook($prj_id, $issue_id);
+$tpl->assign("allowed_reporters", $t);
+
+$tpl->displayTemplate();

=== added file 'lib/eventum/class.edit_reporter.php'
--- lib/eventum/class.edit_reporter.php	1970-01-01 00:00:00 +0000
+++ lib/eventum/class.edit_reporter.php	2011-12-14 10:15:29 +0000
@@ -0,0 +1,72 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
+// +----------------------------------------------------------------------+
+// | Eventum - Issue Tracking System                                      |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 2003 - 2008 MySQL AB                                   |
+// | Copyright (c) 2008 - 2010 Sun Microsystem Inc.                       |
+// | Copyright (c) 2011 - 2011 Anderson.net New Zealand                   |
+// |                                                                      |
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation; either version 2 of the License, or    |
+// | (at your option) any later version.                                  |
+// |                                                                      |
+// | This program is distributed in the hope that it will be useful,      |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+// | GNU General Public License for more details.                         |
+// |                                                                      |
+// | You should have received a copy of the GNU General Public License    |
+// | along with this program; if not, write to:                           |
+// |                                                                      |
+// | Free Software Foundation, Inc.                                       |
+// | 59 Temple Place - Suite 330                                          |
+// | Boston, MA 02111-1307, USA.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Dave Anderson ([e-mail])                             |
+// +----------------------------------------------------------------------+
+
+
+/**
+ * Class designed to handle adding, removing and viewing authorized repliers for an issue.
+ *
+ * @author  Dave Anderson ([e-mail])
+ */
+class Edit_Reporter
+{
+    /**
+     * Modifies an Issue's Reporter.
+     *
+     * @access  public
+     * @param   integer $issue_id The id of the issue.
+     * @param   string $fullname The id of the user.
+     * @param   boolean $add_history If this should be logged.
+     */
+    function update($issue_id, $email, $add_history = true)
+    {
+
+        $email = strtolower(Mail_Helper::getEmailAddress($email));
+        $usr_id = User::getUserIDByEmail($email, true);
+
+        $sql = "UPDATE
+                    " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue
+                SET
+                    iss_usr_id = " . Misc::escapeInteger($usr_id) . "
+                WHERE
+                    iss_id = " . Misc::escapeInteger($issue_id);
+        $res = DB_Helper::getInstance()->query($sql);
+        if (PEAR::isError($res)) {
+            Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
+            return -1;
+        } else {
+            if ($add_history) {
+                // add the change to the history of the issue
+                $summary = 'Reporter was changed to ' . $email . ' by ' . User::getFullName(Auth::getUserID());
+                History::add($issue_id, Auth::getUserID(), History::getTypeID('issue_updated'), $summary);
+            }
+        }  
+        return 1;
+    }
+
+}

=== added file 'templates/edit_reporter.tpl.html'
--- templates/edit_reporter.tpl.html	1970-01-01 00:00:00 +0000
+++ templates/edit_reporter.tpl.html	2011-12-14 10:15:29 +0000
@@ -0,0 +1,73 @@
+{include file="header.tpl.html"}
+
+<br />
+
+{literal}
+<script type="text/javascript">
+<!--
+function validate(f)
+{
+    if (isWhitespace(f.email.value)) {
+        alert('{/literal}{t escape=js}Please enter a valid email address.{/t}{literal}');
+        selectField(f, 'email');
+        return false;
+    }
+    return true;
+}
+//-->
+</script>
+{/literal}
+<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
+<script type="text/javascript" src="{$rel_url}js/overlib_mini.js?c=d23a"></script>
+<table width="100%" bgcolor="{$cell_color}" border="0" cellspacing="0" cellpadding="1" align="center">
+  <tr>
+    <td>
+      <table bgcolor="#FFFFFF" width="100%" cellspacing="1" cellpadding="2">
+        <form name="reporter_form" onSubmit="javascript:return validate(this);" method="post" action="{$smarty.server.PHP_SELF}">
+        <input type="hidden" name="cat" value="update">
+        <input type="hidden" name="id" value="{$smarty.get.id}">
+        <input type="hidden" name="issue_id" value="{$issue_id}">
+        {if $current_role > $roles.reporter}
+        <tr>
+          <td colspan="2" class="default">
+            <b>{t}Project Reporters{/t}</b>
+          </td>
+        </tr>
+        {if $insert_result != ""}
+        <tr>
+          <td colspan="2" bgcolor="{$cell_color}" align="center" class="error">
+            {if $insert_result == -1}
+              {t}An error occurred while trying to update the Reporter.{/t}
+            {elseif $insert_result == 1}
+              {t}Thank you, the Reporter was updated successfully.{/t}
+            {/if}
+          </td>
+        </tr>
+        {/if}
+        <tr>
+          <td width="120" bgcolor="{$cell_color}" class="default_white">
+            <b>{t}Reporter{/t}:</b>
+          </td>
+          <td bgcolor="{$light_color}">
+            <input type="text" name="email" size="40" class="default" value="{$info.sub_email}">
+            {if not ($os.mac and $browser.ie)}<a href="javascript:void(null);" onClick="return overlib(getFillInput('{include file="lookup_layer.tpl.html" list=$allowed_reporters}', 'reporter_form', 'email'), STICKY, HEIGHT, 50, WIDTH, 160, BELOW, LEFT, CLOSECOLOR, '#FFFFFF', FGCOLOR, '#FFFFFF', BGCOLOR, '#333333', CAPTION, 'Lookup Details', CLOSECLICK);" onMouseOut="javascript:nd();"><img src="{$rel_url}images/lookup.gif" border="0"></a>{/if}
+            {include file="error_icon.tpl.html" field="email"}
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2" bgcolor="{$cell_color}" align="center">
+            <input class="button" type="submit" value="{t}Save Reporter{/t}">
+            <input type="button" value="{t}Cancel{/t}" class="button" onClick="javascript:closeAndRefresh();">
+          </td>
+        </tr>
+        </form>
+        {/if}
+      </table>
+    </td>
+  </tr>
+</table>
+
+<br />
+
+{include file="app_info.tpl.html"}
+{include file="footer.tpl.html"}

=== modified file 'templates/view_form.tpl.html'
--- templates/view_form.tpl.html	2011-10-08 07:56:29 +0000
+++ templates/view_form.tpl.html	2011-12-14 10:15:29 +0000
@@ -27,6 +27,12 @@
     var popupWin = window.open('authorized_replier.php?iss_id=' + issue_id, '_replier', features);
     popupWin.focus();
 }
+function openReporter(issue_id)
+{
+    var features = 'width=440,height=400,top=30,left=30,resizable=yes,scrollbars=yes,toolbar=no,location=no,menubar=no,status=no';
+    var popupWin = window.open('edit_reporter.php?iss_id=' + issue_id, '_reporter', features);
+    popupWin.focus();
+}
 function signupAsAuthorizedReplier(issue_id)
 {
     var features = 'width=420,height=400,top=30,left=30,resizable=yes,scrollbars=yes,toolbar=no,location=no,menubar=no,status=no';
@@ -188,6 +194,7 @@
           </td>
           <td colspan="2" align="right" class="default">
             {if $current_role > $roles.customer}
+            [ <a class="link" title="{t}Edit the Reporter for this issue{/t}" href="javascript:void(null);" onClick="javascript:openReporter({$smarty.get.id});">{t}Edit Reporter{/t}</a> ]
             [ <a class="link" title="{t}edit the authorized repliers list for this issue{/t}" href="javascript:void(null);" onClick="openAuthorizedReplier({$smarty.get.id|intval});">{t}Edit Authorized Replier List{/t}</a> ]
             [ <a class="link" title="{t}edit the notification list for this issue{/t}" href="javascript:void(null);" onClick="openNotification({$smarty.get.id|intval});">{t}Edit Notification List{/t}</a> ]
             {/if}