Author: glen Date: Wed Jul 19 18:00:49 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from bryan
---- Files affected:
SOURCES:
eventum-iss_close_bug.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/eventum-iss_close_bug.patch
diff -u /dev/null SOURCES/eventum-iss_close_bug.patch:1.1
--- /dev/null Wed Jul 19 20:00:49 2006
+++ SOURCES/eventum-iss_close_bug.patch Wed Jul 19 20:00:44 2006
@@ -0,0 +1,102 @@
+--- 1.411/ChangeLog 2006-07-18 17:47:13 +02:00
++++ 1.412/ChangeLog 2006-07-19 16:50:11 +02:00
+@@ -20,6 +20,7 @@
+ - Fixed bug with date fields on advanced search page not showing correctly
(Bryan)
+ - Fixed bug with message body not being displayed when Content-Type is
missing (Bryan)
+ - Fixed PHP warning in customer backend (Bryan)
++- Fixed bug caused by whitespace at start of email address (Elan Ruusamäe)
+
+ 31 Mar 2006, Version 1.7.1
+ - Fixed bug with Workflow::handleAssignmentChange() being called too often
(Bryan)
+
+--- 1.65/include/class.notification.php 2006-06-26 21:48:28 +02:00
++++ 1.66/include/class.notification.php 2006-07-19 16:50:11 +02:00
+@@ -341,7 +341,7 @@
+ $headers["Subject"] = Mail_API::formatSubject($issue_id,
$headers['Subject']);
+
+ if (empty($type)) {
+- if (User::getRoleByUser($usr_id, Issue::getProjectID($issue_id))
== User::getRoleID("Customer")) {
++ if (($sender_usr_id != false) &&
(User::getRoleByUser($sender_usr_id, Issue::getProjectID($issue_id)) ==
User::getRoleID("Customer"))) {
+ $type = 'customer_email';
+ } else {
+ $type = 'other_email';
+@@ -1550,6 +1550,10 @@
+ WHERE
+ sub_usr_id=usr_id AND
+ sub_iss_id=$issue_id";
++ if ($min_role != false) {
++ $stmt .= " AND
++ pru_role >= " . Misc::escapeInteger($min_role);
++ }
+ if ($type != false) {
+ $stmt .= " AND\nsbt_sub_id = sub_id AND
+ sbt_type = '" . Misc::escapeString($type) . "'";
+--- 1.9/templates/checkins.tpl.html 2006-05-22 19:48:55 +02:00
++++ 1.10/templates/checkins.tpl.html 2006-07-19 16:50:11 +02:00
+@@ -63,12 +63,12 @@
+ <td class="default">{$checkins[i].isc_module|escape:"html"}
+
+ {if $checkins[i].checkout_url}
+- <a title="{t 1=$checkins[i].isc_new_version
2=$checkins[i].isc_filename}see the source of revision %1 of %2"
target="_checkout" class="link"
href="{$checkins[i].checkout_url}">{$checkins[i].isc_filename|escape:"html"}
({$checkins[i].isc_new_version})
++ <a title="{t 1=$checkins[i].isc_new_version
2=$checkins[i].isc_filename}see the source of revision %1 of %2{/t}"
target="_checkout" class="link"
href="{$checkins[i].checkout_url}">{$checkins[i].isc_filename|escape:"html"}
({$checkins[i].isc_new_version})
+ {else}
+ {$checkins[i].isc_filename|escape:"html"}
+ {/if}
+ {if $checkins[i].diff_url}
+- [<a title="{t 1=$checkins[i].isc_old_version}see the diff
to revision %1" target="_checkout" class="link"
href="{$checkins[i].diff_url}">{t 1=$checkins[i].isc_old_version}diff to
%1{/t}]
++ [<a title="{t 1=$checkins[i].isc_old_version}see the diff
to revision %1{/t}" target="_checkout" class="link"
href="{$checkins[i].diff_url}">{t 1=$checkins[i].isc_old_version}diff to
%1{/t}]
+ {/if}
+
+
+--- 1.16/templates/close.tpl.html 2006-05-22 19:48:55 +02:00
++++ 1.17/templates/close.tpl.html 2006-07-19 16:50:11 +02:00
+@@ -70,7 +70,7 @@
+ }
+ }
+ if (has_checked_incident == false) {
+- return confirm('{/literal}{t}This customer has a per incident
contract. You have chosen not to redeem any incidents. Press
+\'OK\' to confirm or \'Cancel\' to revise.{/t}{literal}');
++ return confirm('{/literal}{t escape=js}This customer has a per
incident contract. You have chosen not to redeem any incidents. Press \'OK\'
to confirm or \'Cancel\' to revise.{/t}{literal}');
+ }
+ }
+ return true;
+--- 1.9/templates/convert_note.tpl.html 2006-05-22 19:48:55 +02:00
++++ 1.10/templates/convert_note.tpl.html 2006-07-19 16:50:11 +02:00
+@@ -28,9 +28,9 @@
+
+ <!--
+ {if $has_customer_integration}
+- var convert_email_warning = '{t}WARNING: Converting this note to an
email will send the email to any customers that may be listed in this issue\'s
notification list.{/t}';
++ var convert_email_warning = "{t escape=js}WARNING: Converting this note
to an email will send the email to any customers that may be listed in this
issue\'s notification list.{/t}";
+ {else}
+- var convert_email_warning = '{t}WARNING: Converting this note to an
email will send the email to all users listed in this issue\'s notification
list.{/t}';
++ var convert_email_warning = "{t escape=js}WARNING: Converting this note
to an email will send the email to all users listed in this issue\'s
notification list.{/t}";
+ {/if}
+ {literal}
+ function validateForm(f)
+@@ -96,9 +96,9 @@
+
+
+
+- <input type="checkbox" name="add_authorized_replier" value="1"
disabled>
++ <input type="checkbox" name="add_authorized_replier" value="1"
disabled id="add_authorized_replier_check">
+
+- {t}Add sender to authorized repliers list?{/t}
++ {t}Add sender to authorized repliers list?{/t}
+
+
+
+--- 1.15/templates/notes.tpl.html 2006-05-04 05:14:32 +02:00
++++ 1.16/templates/notes.tpl.html 2006-07-19 16:50:11 +02:00
+@@ -14,7 +14,7 @@
+ }
+ function convertNote(note_id)
+ {
+- if (!confirm('{/literal}{t}This note will be deleted & converted to an
email, one either sent immediately or saved as a draft.{/t}{literal}')) {
++ if (!confirm('{/literal}{t escape=none}This note will be deleted &
converted to an email, one either sent immediately or saved as a
draft.{/t}{literal}')) {
+ return false;
+ } else {
+ var features =
'width=420,height=180,top=30,left=30,resizable=yes,scrollbars=yes,toolbar=no,location=no,menubar=no,status=no';
+
+
+--
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
