Index: openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml,v diff -u -r1.23 -r1.24 --- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml 28 Dec 2005 18:22:59 -0000 1.23 +++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml 30 Jan 2006 17:55:34 -0000 1.24 @@ -355,7 +355,7 @@ Verschiebe Aufgabe zu Projekt n/a Name - Job ID: + Projekt ID: &nbsp;&nbsp;%project_term% Neuer Prozess Neues %project_term% @@ -383,6 +383,7 @@ �berf�llige Aufgaben �berblick �ber den Prozess: Paketinstanz + Projekt Instanzen Seite) Parameter Party ID @@ -416,7 +417,7 @@ Prozessaufgaben: Prozess Aufgaben Prozesse - Job + Projekt Projekt F�ge <input type="hidden" name="process_id" value="%process_id%"><input type="text" name="number" size="3" value="1" /> neue Aufgabe(n) zu diesem Prozess hinzu (nicht aktuell, w�hlen Sie die live Version von <a href="task-revisions?task_id=%task_info.item_id%">Aufgaben�nderung</a> page) @@ -470,7 +471,7 @@ Suche Geben Sie ein Schl�sselwort ein, um nach Projekten zu suchen. JobID suchen - Project suchen + Projekt suchen User oder Gruppen suchen Sektion W�hlen Sie aus dem Projekt einen Beauftragten aus um eine Nachricht zu versenden @@ -484,6 +485,7 @@ Anzeigen Auch Abgeschlossene anzeigen Dieses Projekt anzeigen + Subprojekte anzeigen? Diese Aufgabe auslassen? Pufferzeit: Puffer-<br>zeit Index: openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml,v diff -u -r1.55 -r1.56 --- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml 28 Dec 2005 18:22:59 -0000 1.55 +++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml 30 Jan 2006 17:55:34 -0000 1.56 @@ -453,6 +453,7 @@ Overdue Tasks Overview of process: Package Instance + Package Instance page) Parameters Party ID @@ -555,6 +556,7 @@ Show Show closed Show this projects + Show Subprojects Skip this task? Slack: Slack Index: openacs-4/packages/project-manager/tcl/project-manager-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/project-manager/tcl/project-manager-procs.tcl 7 Jan 2006 07:21:16 -0000 1.10 +++ openacs-4/packages/project-manager/tcl/project-manager-procs.tcl 30 Jan 2006 17:55:34 -0000 1.11 @@ -436,23 +436,17 @@ } # now send out email - + if {[string equal $send_email_p t]} { # task if {[string equal $type task]} { - if { [exists_and_not_null $to]} { - set assignees $to - } else { - set assignees [pm::task::assignee_email_list -task_item_id $object_id] - } + set assignees $to if {[llength $assignees] > 0} { - set to_address $assignees - set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] set task_url [pm::task::get_url $object_id] @@ -467,13 +461,17 @@ set project_item_id [pm::task::project_item_id -task_item_id $object_id] - pm::util::email \ - -to_addr $to_address \ - -from_addr $from_address \ - -subject $subject \ - -body $content \ - -mime_type "text/html" \ - -object_id "$project_item_id" + foreach to_address $assignees { + acs_mail_lite::complex_send \ + -send_immediately \ + -to_addr "$to_address" \ + -from_addr "$from_address" \ + -subject "$subject" \ + -body $content \ + -mime_type "text/html" \ + -object_id "$project_item_id" \ + -no_callback_p + } } } @@ -482,16 +480,10 @@ if {[string equal $type project]} { - if { [exists_and_not_null $to]} { - set assignees $to - } else { - set assignees [pm::project::assignee_email_list -project_item_id $object_id] - } + set assignees $to if {[llength $assignees] > 0} { - set to_address $assignees - set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] set project_url [pm::project::url \ @@ -505,14 +497,19 @@ set content "$title

$comment_html" - - pm::util::email \ - -to_addr $to_address \ - -from_addr $from_address \ - -subject $subject \ - -body $content \ - -mime_type "text/html" \ - -object_id "$object_id" + + foreach to_address $assignees { + acs_mail_lite::complex_send \ + -send_immediately \ + -to_addr "$to_address" \ + -from_addr "$from_address" \ + -subject "$subject" \ + -body $content \ + -mime_type "text/html" \ + -object_id "$object_id" \ + -no_callback_p + } + } } Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/assign-myself-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/comments/add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/comments/add.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/www/comments/add.adp 17 Oct 2005 21:28:08 -0000 1.2 +++ openacs-4/packages/project-manager/www/comments/add.adp 30 Jan 2006 17:55:35 -0000 1.3 @@ -1,6 +1,6 @@ @title@ - @context@ + @context;noquote@