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.13 -r1.14
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml 27 Jul 2005 19:02:19 -0000 1.13
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml 30 Jul 2005 19:06:15 -0000 1.14
@@ -479,6 +479,7 @@
Search:
Search:
Search
+ Search User
Section
Select process:
Select Project
Index: openacs-4/packages/project-manager/www/project-assign-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/project-assign-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/www/project-assign-edit.adp 30 Jul 2005 18:32:36 -0000 1.5
+++ openacs-4/packages/project-manager/www/project-assign-edit.adp 30 Jul 2005 19:05:41 -0000 1.6
@@ -2,7 +2,7 @@
@title@
@context@
-
+#project-manager.search_user#
@html;noquote@
Index: openacs-4/packages/project-manager/www/project-assign-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/project-assign-edit.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/project-manager/www/project-assign-edit.tcl 30 Jul 2005 18:32:36 -0000 1.10
+++ openacs-4/packages/project-manager/www/project-assign-edit.tcl 30 Jul 2005 19:05:41 -0000 1.11
@@ -17,11 +17,6 @@
} -errors {
}
-
-# Validate that search_user_id is on persons table to get the user name
-ad_return_complaint 1 "[template::form is_valid search_user]"
-
-
# The unique identifier for this package.
set package_id [ad_conn package_id]
@@ -66,9 +61,18 @@
set assigned($party_id-$role_id) 1
}
+
set assignee_list_of_lists [pm::util::subsite_assignees_list_of_lists]
+if { ![empty_string_p $search_user_id]} {
+ # Get the user name
+ set fullname [db_string get_user_fullname { } -default ""]
+ if { ![empty_string_p $fullname] && [string equal [lsearch $assignee_list_of_lists [list $fullname $search_user_id]] "-1"] } {
+ lappend assignee_list_of_lists [list $fullname $search_user_id]
+ }
+}
+
set html ""
-
-ad_form -name search_user -form {
- {project_item_id:text(hidden)
- {value $project_item_id}
- }
- {return_url:text(hidden)
- {value $return_url}
- }
- {search_user_id:party_search(party_search),optional
- {label "Search for User:"}
- }
-}
-
Index: openacs-4/packages/project-manager/www/project-assign-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/project-assign-edit.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/www/project-assign-edit.xql 30 Jul 2005 19:05:41 -0000 1.1
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ select
+ first_names ||' '|| last_name as fullname
+ from
+ persons
+ where
+ person_id = :search_user_id
+
+
+
+
\ No newline at end of file
Index: openacs-4/packages/project-manager/www/search-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/search-user.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/www/search-user.adp 30 Jul 2005 19:05:41 -0000 1.1
@@ -0,0 +1,5 @@
+
+@title;noquote@
+@context;noquote@
+
+
\ No newline at end of file
Index: openacs-4/packages/project-manager/www/search-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/search-user.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/project-manager/www/search-user.tcl 30 Jul 2005 19:05:41 -0000 1.1
@@ -0,0 +1,32 @@
+ad_page_contract {
+ Search for a user in the system.
+
+ @author Anny Flores (annyflores@viaro.net)
+ @author Viaro Networks www.viaro.net
+
+
+} {
+ project_item_id:integer,notnull
+ return_url:notnull
+}
+
+
+set project_name [pm::project::name -project_item_id $project_item_id]
+
+set title "[_ project-manager.search_user]"
+set context [list [list "one?project_item_id=$project_item_id" "$project_name"] \
+ [list "project-assign-edit?project_item_id=$project_item_id&return_url=$return_url" [_ project-manager.Edit_assignees]] $title]
+
+ad_form -name search_user -form {
+ {project_item_id:text(hidden)
+ {value $project_item_id}
+ }
+ {return_url:text(hidden)
+ {value $return_url}
+ }
+ {search_user_id:party_search(party_search),optional
+ {label "Search for User:"}
+ }
+} -after_submit {
+ ad_returnredirect "project-assign-edit?project_item_id=$project_item_id&search_user_id=$search_user_id&return_url=$return_url"
+}