Index: openacs-4/packages/project-manager/lib/search-project.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/search-project.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/search-project.adp 17 Dec 2005 10:33:08 -0000 1.1
+++ openacs-4/packages/project-manager/lib/search-project.adp 18 Dec 2005 20:10:38 -0000 1.2
@@ -1,8 +1,8 @@
-
+
-
+
Index: openacs-4/packages/project-manager/lib/search-project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/search-project.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/search-project.tcl 17 Dec 2005 10:33:08 -0000 1.1
+++ openacs-4/packages/project-manager/lib/search-project.tcl 18 Dec 2005 20:10:38 -0000 1.2
@@ -33,6 +33,7 @@
set match_length [llength $match_projects]
if { [string equal $match_length 0] } {
# No Match just redirect
+ ad_return_error "otto"
ad_returnredirect $return_url
} else {
set project_item_id [lindex [lindex $match_projects 0] 0]
Index: openacs-4/packages/project-manager/lib/search-project.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/search-project.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/search-project.xql 17 Dec 2005 10:33:08 -0000 1.1
+++ openacs-4/packages/project-manager/lib/search-project.xql 18 Dec 2005 20:10:38 -0000 1.2
@@ -11,8 +11,8 @@
from
pm_projectsx
where
- lower(object_title) like lower(:keyword)
- or lower(project_code) like lower(:keyword)
+ lower(object_title) = lower(:keyword)
+ or lower(project_code) like '%$keyword%'
order by
object_title asc
Index: openacs-4/packages/project-manager/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/project-manager/lib/tasks.tcl 17 Dec 2005 10:33:08 -0000 1.44
+++ openacs-4/packages/project-manager/lib/tasks.tcl 18 Dec 2005 20:10:38 -0000 1.45
@@ -107,7 +107,6 @@
set contacts_url [util_memoize [list site_node::get_package_url \
-package_key contacts]]
-
# set up context bar
set context [list "[_ project-manager.Tasks]"]
@@ -404,7 +403,7 @@
}
party_id {
label "[_ project-manager.Who]"
- display_template { @tasks.assignee_name@
+ display_template { @tasks.assignee_name@
}
}
role {
@@ -675,8 +674,14 @@
set actual_days_worked ""
}
set my_user_id $user_id
- set user_url [export_vars \
- -base "${contacts_url}contact" {{party_id $party_id}}]
+
+ # if contacts is installed, link to it, otherwise link to pvt home
+ if {[string eq "" $contacts_url]} {
+ set user_url [export_vars -base "/shared/community-member" {{user_id $party_id}}]
+ } else {
+ set user_url [export_vars \
+ -base "${contacts_url}contact" {{party_id $party_id}}]
+ }
acs_object::get -object_id $task_item_id -array task_array
set base_url [lindex [site_node::get_url_from_object_id -object_id $task_array(package_id)] 0]