Author: glen Date: Thu Mar 8 17:43:55 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediff with [EMAIL PROTECTED]
---- Files affected:
SOURCES:
eventum-associated_issue_text.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/eventum-associated_issue_text.patch
diff -u SOURCES/eventum-associated_issue_text.patch:1.1
SOURCES/eventum-associated_issue_text.patch:1.2
--- SOURCES/eventum-associated_issue_text.patch:1.1 Thu Mar 8 18:39:02 2007
+++ SOURCES/eventum-associated_issue_text.patch Thu Mar 8 18:43:50 2007
@@ -1,85 +1,31 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/06/22 01:27:38-05:00 [EMAIL PROTECTED]
-# Changed associated issues to be a text field.
-#
-# include/class.issue.php
-# 2005/06/22 01:27:36-05:00 [EMAIL PROTECTED] +18 -3
-# Handle associated issues being submitted as a text field instead of a
select box.
-#
-# js/validation.js
-# 2005/06/22 01:27:37-05:00 [EMAIL PROTECTED] +29 -0
-# Added method to check via AJAX if an issue number exists.
-#
-# misc/validate.php
-# 2005/06/22 01:27:37-05:00 [EMAIL PROTECTED] +63 -0
-# New BitKeeper file ``misc/validate.php''
-#
-# misc/validate.php
-# 2005/06/22 01:27:37-05:00 [EMAIL PROTECTED] +0 -0
-# BitKeeper file C:/work/eventum-internal/misc/validate.php
-#
-# templates/en/update.tpl.html
-# 2005/06/22 01:27:37-05:00 [EMAIL PROTECTED] +3 -0
-# Inlcude httpclient javascript
-#
-# templates/en/update_form.tpl.html
-# 2005/06/22 01:27:37-05:00 [EMAIL PROTECTED] +17 -6
-# Changed associated issues to be a text field.
-#
-# update.php
-# 2005/06/22 01:27:37-05:00 [EMAIL PROTECTED] +1 -1
-# Changed associated issues to be a text field.
-#
-diff -Nru a/include/class.issue.php b/include/class.issue.php
---- a/include/class.issue.php 2007-03-08 10:40:23 -06:00
-+++ b/include/class.issue.php 2007-03-08 10:40:23 -06:00
-@@ -1085,6 +1085,9 @@
- function update($issue_id)
- {
- global $HTTP_POST_VARS;
-+ global $errors;
-+
-+ $errors = array();
-
- $issue_id = Misc::escapeInteger($issue_id);
+Index: update.php
+===================================================================
+--- update.php (revision 3269)
++++ update.php (working copy)
+@@ -83,6 +83,7 @@
+ if (@$_POST["cat"] == "update") {
+ $res = Issue::update($_POST["issue_id"]);
+ $tpl->assign("update_result", $res);
++ $tpl->assign("errors", $errors);
+ if (Issue::hasDuplicates($_POST["issue_id"])) {
+ $tpl->assign("has_duplicates", "yes");
+ }
+@@ -118,7 +119,6 @@
+ "resolutions" => Resolution::getAssocList(),
+ "users" => Project::getUserAssocList($prj_id, 'active',
User::getRoleID('Customer')),
+ "issues" => Issue::getColList("iss_id <> $issue_id"),
+- "assoc_issues" => array_map("htmlspecialchars",
Issue::getAssocList()),
+ "one_week_ts" => time() + (7 * DAY),
+ "allow_unassigned_issues" => @$setup["allow_unassigned_issues"],
+ "groups" => Group::getAssocList($prj_id)
+Index: js/validation.js
+===================================================================
+--- js/validation.js (revision 3271)
++++ js/validation.js (working copy)
+@@ -2,9 +2,34 @@
+ * @(#) $Id$
+ */
-@@ -1093,12 +1096,24 @@
- // get all of the 'current' information of this issue
- $current = Issue::getDetails($issue_id);
- // update the issue associations
-- $association_diff = Misc::arrayDiff($current['associated_issues'],
@$HTTP_POST_VARS['associated_issues']);
-+ if (empty($HTTP_POST_VARS['associated_issues'])) {
-+ $associated_issues = array();
-+ } else {
-+ $associated_issues = explode(',',
@$HTTP_POST_VARS['associated_issues']);
-+ // make sure all associated issues are valid (and in this project)
-+ for ($i = 0; $i < count($associated_issues); $i++) {
-+ if (!Issue::exists(trim($associated_issues[$i]))) {
-+ $errors['Associated Issues'][] = 'Issue #' .
$associated_issues[$i] . ' does not exist and was removed from the list of
associated issues.';
-+ unset($associated_issues[$i]);
-+ }
-+ }
-+ }
-+ $association_diff = Misc::arrayDiff($current['associated_issues'],
$associated_issues);
- if (count($association_diff) > 0) {
- // go through the new assocations, if association already exists,
skip it
- $associations_to_remove = $current['associated_issues'];
-- if (count(@$HTTP_POST_VARS['associated_issues']) > 0) {
-- foreach ($HTTP_POST_VARS['associated_issues'] as $index =>
$associated_id) {
-+ if (count($associated_issues) > 0) {
-+ foreach ($associated_issues as $index => $associated_id) {
- if (!in_array($associated_id,
$current['associated_issues'])) {
- Issue::addAssociation($issue_id, $associated_id,
$usr_id);
- } else {
-diff -Nru a/js/validation.js b/js/validation.js
---- a/js/validation.js 2007-03-08 10:40:23 -06:00
-+++ b/js/validation.js 2007-03-08 10:40:23 -06:00
-@@ -1,5 +1,34 @@
- <!--
- // @(#) $Id$
-+
+last_issue_number_validation_value = '';
+function validateIssueNumberField(baseURL, form_name, field_name)
+{
@@ -93,7 +39,7 @@
+ validate_issue_http_client.loadRemoteContent(baseURL +
'misc/validate.php?action=validateIssueNumbers&values=' +
+ form_value + '&field_name=' + field_name + '&form_name=' + form_name,
'displayIssueFieldValidation');
+}
-+
+
+function displayIssueFieldValidation(response)
+{
+ var chunks = response.responseText.split(':',3);
@@ -107,20 +53,65 @@
+ error_span.innerHTML = '';
+ }
+}
-+
+
+-
function isValidDate(f, field_prefix)
{
var selected_date = new Date();
-diff -Nru a/misc/validate.php b/misc/validate.php
---- /dev/null Wed Dec 31 16:00:00 196900
-+++ b/misc/validate.php 2007-03-08 10:40:23 -06:00
+Index: include/class.issue.php
+===================================================================
+--- include/class.issue.php (revision 3269)
++++ include/class.issue.php (working copy)
+@@ -1326,6 +1326,10 @@
+ */
+ function update($issue_id)
+ {
++
++ global $errors;
++ $errors = array();
++
+ $issue_id = Misc::escapeInteger($issue_id);
+
+ $usr_id = Auth::getUserID();
+@@ -1333,12 +1337,24 @@
+ // get all of the 'current' information of this issue
+ $current = Issue::getDetails($issue_id);
+ // update the issue associations
+- $association_diff = Misc::arrayDiff($current['associated_issues'],
@$_POST['associated_issues']);
++ if (empty($_POST['associated_issues'])) {
++ $associated_issues = array();
++ } else {
++ $associated_issues = explode(',', @$_POST['associated_issues']);
++ // make sure all associated issues are valid (and in this project)
++ for ($i = 0; $i < count($associated_issues); $i++) {
++ if (!Issue::exists(trim($associated_issues[$i]))) {
++ $errors['Associated Issues'][] = 'Issue #' .
$associated_issues[$i] . ' does not exist and was removed from the list of
associated issues.';
++ unset($associated_issues[$i]);
++ }
++ }
++ }
++ $association_diff = Misc::arrayDiff($current['associated_issues'],
$associated_issues);
+ if (count($association_diff) > 0) {
+ // go through the new assocations, if association already exists,
skip it
+ $associations_to_remove = $current['associated_issues'];
+- if (count(@$_POST['associated_issues']) > 0) {
+- foreach ($_POST['associated_issues'] as $index =>
$associated_id) {
++ if (count($associated_issues) > 0) {
++ foreach ($associated_issues as $index => $associated_id) {
+ if (!in_array($associated_id,
$current['associated_issues'])) {
+ Issue::addAssociation($issue_id, $associated_id,
$usr_id);
+ } else {
+Index: misc/validate.php
+===================================================================
+--- misc/validate.php (revision 0)
++++ misc/validate.php (revision 0)
@@ -0,0 +1,63 @@
+<?php
-+/* vim: set expandtab tabstop=4 shiftwidth=4: */
++/* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
+// +----------------------------------------------------------------------+
+// | Eventum - Issue Tracking System |
+// +----------------------------------------------------------------------+
-+// | Copyright (c) 2003, 2004 MySQL AB |
++// | Copyright (c) 2003, 2004, 2007 MySQL AB |
+// | |
+// | 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 |
@@ -144,7 +135,8 @@
+//
+// @(#) $Id$
+//
-+include_once("../config.inc.php");
++
++require_once(dirname(__FILE__) . '/../init.php');
+include_once(APP_INC_PATH . "class.auth.php");
+include_once(APP_INC_PATH . "class.issue.php");
+include_once(APP_INC_PATH . "db_access.php");
@@ -177,11 +169,10 @@
+ return $_REQUEST['form_name'] . ':' . $_REQUEST['field_name'] . ':' .
'ok';
+ }
+}
-+?>
-\ No newline at end of file
-diff -Nru a/templates/en/update.tpl.html b/templates/en/update.tpl.html
---- a/templates/en/update.tpl.html 2007-03-08 10:40:23 -06:00
-+++ b/templates/en/update.tpl.html 2007-03-08 10:40:23 -06:00
+Index: templates/update.tpl.html
+===================================================================
+--- templates/update.tpl.html (revision 3269)
++++ templates/update.tpl.html (working copy)
@@ -1,5 +1,8 @@
{include file="header.tpl.html"}
{include file="navigation.tpl.html"}
@@ -191,16 +182,18 @@
{if $issue == ""}
<table width="300" align="center">
-diff -Nru a/templates/en/update_form.tpl.html
b/templates/en/update_form.tpl.html
---- a/templates/en/update_form.tpl.html 2007-03-08 10:40:23 -06:00
-+++ b/templates/en/update_form.tpl.html 2007-03-08 10:40:23 -06:00
-@@ -14,7 +14,20 @@
+Index: templates/update_form.tpl.html
+===================================================================
+--- templates/update_form.tpl.html (revision 3269)
++++ templates/update_form.tpl.html (working copy)
+@@ -14,7 +14,22 @@
{if $has_duplicates == 'yes'}
- Also, all issues that are marked as duplicates from this one
were updated as well.
+ <br />{t}Also, all issues that are marked as duplicates from
this one were updated as well.{/t}
{/if}
- <br /><br />
++
+ {if $errors|@count > 0}
-+ <br /><br />However, there are some warnings you should be
aware of.<br />
++ <br /><br />However, there are some warnings you should be
aware of:<br />
+ <ul>
+ {foreach from=$errors key=section item=sub_errors}
+ <li>{$section}<br />
@@ -213,40 +206,22 @@
+ {else}
+ <br /><br />
+ {/if}
- <a href="view.php?id={$smarty.post.issue_id}"
class="link">Return to Issue #{$smarty.post.issue_id} Details Page</a>
- {/if}
- </td>
-@@ -175,11 +188,9 @@
- <nobr><b>Associated Issues:</b></nobr>
++
+ <b>
+ <a href="update.php?id={$smarty.post.issue_id}"
class="link">{t 1=$smarty.post.issue_id}Update Issue #%1{/t}</a><br />
+ <a href="view.php?id={$smarty.post.issue_id}" class="link">{t
1=$smarty.post.issue_id}Return to Issue #%1 Details Page{/t}</a>
+@@ -190,11 +205,9 @@
+ <nobr><b>{t}Associated Issues:{/t}</b></nobr>
</td>
<td bgcolor="{$light_color}">
- <select size="4" multiple name="associated_issues[]"
class="default" onChange="showSelections('update_form', 'associated_issues[]')">
- {html_options values=$issues output=$issues
selected=$issue.associated_issues}
-- </select><input type="button" class="shortcut" value="Clear
Selections" onClick="javascript:clearSelectedOptions(getFormElement(this.form,
'associated_issues[]'));showSelections('update_form',
'associated_issues[]');"><br />
-- {include file="lookup_field.tpl.html" lookup_field_name="search"
lookup_field_target="associated_issues[]" callbacks="new
Array('showSelections(\'update_form\', \'associated_issues[]\')')"}
-- <div class="default" id="selection_associated_issues[]">{if
$issue.associated_issues}Current Selections: {section name="i"
loop=$issue.associated_issues}{if %i.rownum% >
1}, {/if}{$issue.associated_issues[i]}{/section}{/if}</div>
+- </select>
+- {if not ($os.mac and $browser.ie)}<a title="lookup issues by
their summaries" href="javascript:void(null);" onClick="return
overlib(getOverlibContents('{include file="lookup_layer.tpl.html"
list=$assoc_issues multiple=1}', 'update_form', 'associated_issues[]', true),
STICKY, HEIGHT, 50, WIDTH, 250, BELOW, RIGHT, CLOSECOLOR, '#FFFFFF', FGCOLOR,
'#FFFFFF', BGCOLOR, '#000000', CAPTION, 'Lookup Details', CLOSECLICK);"
onMouseOut="javascript:nd();"><img src="{$rel_url}images/lookup.gif"
border="0"></a>{/if}
+- <div class="default" id="selection_associated_issues[]"></div>
+ <input type="text" name="associated_issues" value="{",
"|join:$issue.associated_issues}" class="default"
onBlur="validateIssueNumberField('{$rel_url}', 'update_form',
'associated_issues')">
+ {include file="error_icon.tpl.html" field="associated_issues"}
+ <span id="associated_issues_error" class="default"></span>
</td>
{/if}
- <input type="hidden" name="keep" value="yes">
-diff -Nru a/update.php b/update.php
---- a/update.php 2007-03-08 10:40:23 -06:00
-+++ b/update.php 2007-03-08 10:40:23 -06:00
-@@ -69,6 +69,7 @@
- if (@$HTTP_POST_VARS["cat"] == "update") {
- $res = Issue::update($HTTP_POST_VARS["issue_id"]);
- $tpl->assign("update_result", $res);
-+ $tpl->assign("errors", $errors);
- if (Issue::hasDuplicates($HTTP_POST_VARS["issue_id"])) {
- $tpl->assign("has_duplicates", "yes");
- }
-@@ -101,7 +102,6 @@
- "resolutions" => Resolution::getAssocList(),
- "users" => Project::getUserAssocList($prj_id, 'active',
User::getRoleID('Standard User')),// XXX: Internal only, GPL should have
'Customer' instead of standard user.
- "issues" => Issue::getColList(),
-- "assoc_issues" => Issue::getAssocList(),
- "one_week_ts" => time() + (7 * DAY),
- "allow_unassigned_issues" => @$setup["allow_unassigned_issues"],
- "groups" => Group::getAssocList($prj_id)
+ <td nowrap width="130" bgcolor="{$cell_color}"
class="default_white">
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/eventum-associated_issue_text.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
