Merge lp:~raulraat/eventum/raul into lp:eventum

[Raul Raat]

[lp:~raulraat/eventum/raul]

3904. By Bryan Alsdorf on 2009-09-28

Added links to list.php to search for issues from same reporter or customer

3905. By Bryan Alsdorf on 2009-09-28

Added ability for Custom Field backends to use ajax to get options.

3906. By Bryan Alsdorf on 2009-09-28

Merging changes

3907. By Elan Ruusamäe on 2009-09-28

- typo

3908. By Elan Ruusamäe on 2009-09-30

- avoid warnings if setup file is invalid

3909. By Elan Ruusamäe on 2009-09-30

- avoid recursive error when database connection fails

3910. By Elan Ruusamäe on 2009-09-30

- cosmetic

3911. By Elan Ruusamäe on 2009-09-30

- go to setup if config is empty

3912. By Elan Ruusamäe on 2009-09-30

- fix smarty and pear path

3913. By Elan Ruusamäe on 2009-09-30

- check also config files being writable

3914. By Elan Ruusamäe on 2009-09-30

- remove getRequestedURL (use real code instead)
- cosmetics, cleanups

=== added directory 'htdocs/ajax'
=== added file 'htdocs/ajax/update.php'
--- htdocs/ajax/update.php	1970-01-01 00:00:00 +0000
+++ htdocs/ajax/update.php	2009-09-02 15:30:58 +0000
@@ -0,0 +1,83 @@
+<?
+/* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
+// +----------------------------------------------------------------------+
+// | Eventum - Issue Tracking System                                      |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 2003 - 2008 MySQL AB                                   |
+// | Copyright (c) 2008 - 2009 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: Raul Raat <[e-mail]>                              |
+// | Authors: Elan Ruusamäe <[e-mail]>                               |
+// +----------------------------------------------------------------------+
+//
+// @(#) $Id: update.php 3868 2009-03-30 00:22:35Z raul $
+
+require_once(dirname(__FILE__) . '/../../init.php');
+require_once(APP_INC_PATH . "/class.auth.php");
+require_once(APP_INC_PATH . "/class.issue.php");
+
+// check login
+Auth::checkAuthentication(APP_COOKIE);
+
+// check if correct issue id was sent
+if (!is_numeric($_POST['issue_id']) || !Issue::exists($_POST['issue_id'])) {
+    exit;
+}
+
+$usr_id = Auth::getUserID();
+
+// check if user role is above "Standard User"
+if (User::getRoleByUser($usr_id, Issue::getProjectID($issue_id)) < User::getRoleID("Standard User")) {
+	exit;
+}
+
+// check if user can acess the issue
+if (!Issue::canAccess($_POST['issue_id'], $usr_id)) {
+	exit;
+}
+
+switch ($_POST['field_name']) {
+    case 'expected_resolution_date':
+        $day = Misc::escapeInteger($_POST['day']);
+        $month = Misc::escapeInteger($_POST['month']);
+        $year = Misc::escapeInteger($_POST['year']);
+
+        if ($day == 0 && $month == 1 && $year == 0) {
+            // clear button
+            $date = null;
+        } else {
+            $date = sprintf('%04d-%02d-%02d', $year, $month, $day);
+        }
+
+        if (Issue::setExpectedResolutionDate($_POST['issue_id'], $date) !== -1) {
+            if (!is_null($date)) {
+                echo Date_Helper::getSimpleDate($date, false);
+            }
+        } else {
+            echo 'update failed';
+        }
+
+        exit;
+    break;
+
+    default:
+        die('object type not supported');
+    break;
+}

=== modified file 'htdocs/css/style.css'
--- htdocs/css/style.css	2008-06-19 05:30:31 +0000
+++ htdocs/css/style.css	2009-09-10 13:40:49 +0000
@@ -172,4 +172,7 @@
     font-size: 70%;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     padding: 10px;
-}
\ No newline at end of file
+}
+.custom_field {
+    cursor: pointer;
+}

=== modified file 'htdocs/js/global.js'
--- htdocs/js/global.js	2008-10-28 18:23:04 +0000
+++ htdocs/js/global.js	2009-09-02 16:03:27 +0000
@@ -798,4 +798,53 @@
         firstDay: user_prefs.week_firstday
     });
 });
+
+$(document).ready(function(){
+    // dialog type calender isn't working in Konqueror beacuse it's not a supported browser by either jQuery or jQuery UI
+    // http://groups.google.com/group/jquery-ui/browse_thread/thread/ea61238c34cb5f33/046837b02fb90b5c
+    if (navigator.appName != 'Konqueror') {
+        $(".inline_date_pick").click(function() {
+
+            var masterObj = this;
+            var masterObjPos = $(masterObj).offset();
+            // offset gives uses top and left but datepicker needs pageX and pageY
+            var masterObjPos = {pageX:masterObjPos.left, pageY:masterObjPos.top};
+
+            // as i cannot find any documentation about ui.datepicker in dialog mode + blockUI, then i'll disable blockui while showing datepicker
+            // i found in ui.datepicker when in dialog mode: "if ($.blockUI) $.blockUI(this.dpDiv);" so i assume the point was to show the calender in blockUI?
+            var tmp_blockUI = $.blockUI;
+            $.blockUI = false;
+
+            $(this).datepicker(
+                // we use dialog type calender so we won't haveto have a hidden element on the page
+                'dialog',
+                // selected date
+                masterObj.innerHTML,
+                // onclick handler
+                function (date, dteObj) {
+                    var field_name = masterObj.id.substr(0,masterObj.id.indexOf('|'));
+                    var issue_id = masterObj.id.substr(masterObj.id.indexOf('|')+1);
+                    if (date == '') {
+                        // clear button
+                        dteObj.selectedDay = 0;
+                        dteObj.selectedMonth = 0;
+                        dteObj.selectedYear = 0;
+                    }
+                    $.post("/ajax/update.php", {field_name: field_name, issue_id: issue_id, day: dteObj.selectedDay, month: (dteObj.selectedMonth+1), year: dteObj.selectedYear}, function(data) {
+                        masterObj.innerHTML = data;
+                    }, "text");
+                },
+                // config
+                {dateFormat: 'dd M yy', duration: "", firstDay: 1},
+                // position of the datepicker calender - taken from div's offset
+                masterObjPos
+            );
+
+            // restore blockUI
+            $.blockUI = tmp_blockUI;
+
+            return false;
+        });
+    }
+});
 //-->

=== modified file 'lib/eventum/class.issue.php'
--- lib/eventum/class.issue.php	2009-07-23 11:01:34 +0000
+++ lib/eventum/class.issue.php	2009-09-02 15:29:20 +0000
@@ -619,6 +619,62 @@
         }
     }
 
+    /**
+     * Method used to set the expected resolution date of an issue
+     *
+     * @access  public
+     * @param   integer $issue_id The ID of the issue
+     * @param   string $expected_resolution_date The Expected Resolution Date to set this issue too
+     * @return  integer 1 if the update worked, -1 otherwise
+     */
+    function setExpectedResolutionDate($issue_id, $expected_resolution_date)
+    {
+        $issue_id = Misc::escapeInteger($issue_id);
+        $expected_resolution_date = Misc::escapeString($expected_resolution_date);
+        $current = self::getExpectedResolutionDate($issue_id);
+        if ($expected_resolution_date != $current) {
+            $sql = "UPDATE
+                        " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue
+                    SET
+                        iss_expected_resolution_date = " . (empty($expected_resolution_date) ? "null" : " '$expected_resolution_date'") . " 
+                    WHERE
+                        iss_id = $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 {
+            	$usr_id = Auth::getUserID();
+                Notification::notifyIssueUpdated($issue_id, array('iss_expected_resolution_date' => $current), array('expected_resolution_date' => $expected_resolution_date));
+                History::add($issue_id, $usr_id, History::getTypeID('issue_updated'), "Issue updated (Expected Resolution Date: " . History::formatChanges($current, $expected_resolution_date) . ") by " . User::getFullName($usr_id));
+                return 1;
+            }
+        }
+    }
+
+    /**
+     * Returns the current issue expected resolution date
+     *
+     * @access  public
+     * @param   integer $issue_id The ID of the issue
+     * @return  string The Expected Resolution Date
+     */
+    function getExpectedResolutionDate($issue_id)
+    {
+        $sql = "SELECT
+                    iss_expected_resolution_date
+                FROM
+                    " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue
+                WHERE
+                    iss_id = " . Misc::escapeInteger($issue_id);
+        $res = DB_Helper::getInstance()->getOne($sql);
+        if (PEAR::isError($res)) {
+            Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
+            return 0;
+        } else {
+            return $res;
+        }
+    }
 
     /**
      * Method used to set the category of an issue

=== modified file 'lib/eventum/class.notification.php'
--- lib/eventum/class.notification.php	2009-06-27 16:26:21 +0000
+++ lib/eventum/class.notification.php	2009-09-02 14:16:32 +0000
@@ -610,11 +610,11 @@
                 @$diffs[] = '+' . ev_gettext('Assignment List') . ': ' . implode(', ', User::getFullName($new['assignments']));
             }
         }
-        if (@$old['iss_expected_resolution_date'] != $new['expected_resolution_date']) {
+        if (isset($new['expected_resolution_date']) && @$old['iss_expected_resolution_date'] != $new['expected_resolution_date']) {
             $diffs[] = '-' . ev_gettext('Expected Resolution Date') . ': ' . $old['iss_expected_resolution_date'];
             $diffs[] = '+' . ev_gettext('Expected Resolution Date') . ': ' . $new['expected_resolution_date'];
         }
-        if ($old["iss_prc_id"] != $new["category"]) {
+        if (isset($new["category"]) && $old["iss_prc_id"] != $new["category"]) {
             $diffs[] = '-' . ev_gettext('Category') . ': ' . Category::getTitle($old["iss_prc_id"]);
             $diffs[] = '+' . ev_gettext('Category') . ': ' . Category::getTitle($new["category"]);
         }
@@ -622,27 +622,27 @@
             $diffs[] = '-' . ev_gettext('Release') . ': ' . Release::getTitle($old["iss_pre_id"]);
             $diffs[] = '+' . ev_gettext('Release') . ': ' . Release::getTitle($new["release"]);
         }
-        if ($old["iss_pri_id"] != $new["priority"]) {
+        if (isset($new["priority"]) && $old["iss_pri_id"] != $new["priority"]) {
             $diffs[] = '-' . ev_gettext('Priority') . ': ' . Priority::getTitle($old["iss_pri_id"]);
             $diffs[] = '+' . ev_gettext('Priority') . ': ' . Priority::getTitle($new["priority"]);
         }
-        if ($old["iss_sta_id"] != $new["status"]) {
+        if (isset($new["status"]) && $old["iss_sta_id"] != $new["status"]) {
             $diffs[] = '-' . ev_gettext('Status') . ': ' . Status::getStatusTitle($old["iss_sta_id"]);
             $diffs[] = '+' . ev_gettext('Status') . ': ' . Status::getStatusTitle($new["status"]);
         }
-        if ($old["iss_res_id"] != $new["resolution"]) {
+        if (isset($new["resolution"]) && $old["iss_res_id"] != $new["resolution"]) {
             $diffs[] = '-' . ev_gettext('Resolution') . ': ' . Resolution::getTitle($old["iss_res_id"]);
             $diffs[] = '+' . ev_gettext('Resolution') . ': ' . Resolution::getTitle($new["resolution"]);
         }
-        if ($old["iss_dev_time"] != $new["estimated_dev_time"]) {
+        if (isset($new["estimated_dev_time"]) && $old["iss_dev_time"] != $new["estimated_dev_time"]) {
             $diffs[] = '-' . ev_gettext('Estimated Dev. Time') . ': ' . Misc::getFormattedTime($old["iss_dev_time"]*60);
             $diffs[] = '+' . ev_gettext('Estimated Dev. Time') . ': ' . Misc::getFormattedTime($new["estimated_dev_time"]*60);
         }
-        if ($old["iss_summary"] != $new["summary"]) {
+        if (isset($new["summary"]) && $old["iss_summary"] != $new["summary"]) {
             $diffs[] = '-' . ev_gettext('Summary') . ': ' . $old['iss_summary'];
             $diffs[] = '+' . ev_gettext('Summary') . ': ' . $new['summary'];
         }
-        if ($old["iss_description"] != $new["description"]) {
+        if (isset($new["description"]) && $old["iss_description"] != $new["description"]) {
             // need real diff engine here
             require_once 'Text/Diff.php';
             require_once 'Text/Diff/Renderer.php';

=== modified file 'templates/list.tpl.html'
--- templates/list.tpl.html	2009-06-26 11:45:06 +0000
+++ templates/list.tpl.html	2009-09-10 13:40:49 +0000
@@ -153,6 +153,13 @@
         f.go.disabled = true;
     }
 }
+function updateCustomFields(issue_id)
+{
+    var features = 'width=560,height=460,top=30,left=30,resizable=yes,scrollbars=yes,toolbar=no,location=no,menubar=no,status=no';
+    var customWin = window.open('custom_fields.php?issue_id=' + issue_id, '_custom_fields', features);
+    customWin.focus();
+    return false;
+}
 //-->
 </script>
 {/literal}
@@ -240,7 +247,7 @@
           {foreach from=$columns item=column key=field_name}
           {if $field_name == 'custom_fields'}
             {foreach from=$list[i].custom_field key=fld_id item=fld_value}
-                <td bgcolor="{$list[i].status_color}" align="{$column.align|default:'center'}" class="default">
+                <td bgcolor="{$list[i].status_color}" align="{$column.align|default:'center'}" class="default custom_field" onclick="return updateCustomFields({$list[i].iss_id});">
                   {$fld_value|formatCustomValue:$fld_id:$list[i].iss_id}
                 </td>
               {/foreach}
@@ -279,7 +286,7 @@
             {elseif $field_name == 'iss_percent_complete'}
               {$list[i].iss_percent_complete|escape:"html"}%
             {elseif $field_name == 'iss_expected_resolution_date'}
-              {$list[i].iss_expected_resolution_date|escape:"html"}
+              <div class="inline_date_pick" id="expected_resolution_date|{$list[i].iss_id}">{$list[i].iss_expected_resolution_date|escape:"html"}&nbsp;</div>
             {elseif $field_name == 'iss_summary'}
               <a href="view.php?id={$list[i].iss_id}" class="link" title="{t}view issue details{/t}">{$list[i].iss_summary|escape:"html"}</a>
               {if $list[i].redeemed}