Index: openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl 14 Jun 2005 06:42:05 -0000 1.4
+++ openacs-4/packages/dotlrn-project-manager/tcl/dotlrn-project-manager-procs.tcl 16 Jun 2005 05:33:57 -0000 1.5
@@ -65,7 +65,7 @@
-directory_p "t"]
}
- dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key] -package_id $package_id
+ dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key]
}
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.4 -r1.5
--- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml 10 Jun 2005 19:21:14 -0000 1.4
+++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml 16 Jun 2005 05:33:57 -0000 1.5
@@ -22,9 +22,13 @@
Kommentar:
Kommentar
abgeschlossen:
+<<<<<<< project-manager.de_DE.ISO-8859-1.xml
Projekt erstellen
+=======
+ Projekt erstellen
Erstellt
CSV
+>>>>>>> 1.3
Kunde
Kundenname
Kunden
Index: openacs-4/packages/project-manager/lib/projects-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/projects-postgresql.xql 26 May 2005 09:34:27 -0000 1.1
+++ openacs-4/packages/project-manager/lib/projects-postgresql.xql 16 Jun 2005 05:33:57 -0000 1.2
@@ -57,8 +57,8 @@
where ppm.object_id = p.project_id
and ppm.privilege = 'read'
and ppm.party_id = :user_id)
- [template::list::filter_where_clauses -and -name projects]
- [template::list::orderby_clause -orderby -name projects]
+ [template::list::filter_where_clauses -and -name "projects_${package_id}"]
+ [template::list::orderby_clause -orderby -name "projects_${package_id}"]
Index: openacs-4/packages/project-manager/lib/projects.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/projects.adp 10 Jun 2005 19:06:37 -0000 1.2
+++ openacs-4/packages/project-manager/lib/projects.adp 16 Jun 2005 05:33:57 -0000 1.3
@@ -1,5 +1,8 @@
-
+
+
+
+
@@ -14,17 +17,17 @@
@category_select;noquote@
-
+
-
+
|
-
+
Index: openacs-4/packages/project-manager/lib/projects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/projects.tcl 10 Jun 2005 19:21:14 -0000 1.4
+++ openacs-4/packages/project-manager/lib/projects.tcl 16 Jun 2005 05:33:57 -0000 1.5
@@ -34,8 +34,41 @@
}
+
# --------------------------------------------------------------- #
+set _package_id $package_id
+template::multirow create pm_packages "list_id" "contact_column" "community_name"
+set c_row 0
+
+
+
+foreach package_id $_package_id {
+
+
+set _base_url [site_node::get_url_from_object_id -object_id $package_id]
+
+if {![empty_string_p $_base_url]} {
+
+ set base_url $_base_url
+}
+
+set community_id [dotlrn_community::get_community_id_from_url \
+ -url $base_url \
+ ]
+
+if {![empty_string_p $community_id]} {
+
+ set community_name [dotlrn_community::get_community_name $community_id]
+
+ set portal_info_name "Project: $community_name"
+ set portal_info_url "$base_url"
+
+}
+
+
+
+
set exporting_vars { status_id category_id assignee_id orderby format }
set hidden_vars [export_vars -form $exporting_vars]
@@ -45,13 +78,7 @@
# the unique identifier for this package
set user_id [ad_maybe_redirect_for_registration]
-# permissions
-permission::require_permission -party_id $user_id -object_id $package_id -privilege read
-set write_p [permission::permission_p -object_id $package_id -privilege write]
-set create_p [permission::permission_p -object_id $package_id -privilege create]
-set admin_p [permission::permission_p -object_id $package_id -privilege admin]
-
# root CR folder
set root_folder [pm::util::get_root_folder -package_id $package_id]
@@ -74,7 +101,9 @@
set pass_cat $category_id
} else {
set temp_category_id ""
- unset category_id
+ if {[info exists category_id]} {
+ unset category_id
+ }
}
set category_select [pm::util::category_selects \
@@ -108,12 +137,19 @@
# Get url of the contacts package if it has been mounted for the links on the index page.
set contacts_url [util_memoize [list site_node::get_package_url -package_key contacts]]
if {[empty_string_p $contacts_url]} {
- set contact_column "@projects.customer_name@"
+ set contact_column "@projects_${package_id}.customer_name@"
} else {
- set contact_column "@projects.customer_name@"
+ set contact_column "@projects_${package_id}.customer_name@"
}
+# Store project names and all other project individuel data
+set contact_coloum "fff"
+template::multirow append pm_packages "projects_${package_id}" "$contact_column"
+
+ns_log notice "projects = projects_${package_id} c_row=$c_row\n [template::multirow get pm_packages 1 list_id] , [template::multirow columns pm_packages] , [template::multirow size pm_packages]"
+incr c_row
+
# Get the rows to display
set row_list "checkbox {}\nproject_name {}\n"
@@ -122,20 +158,30 @@
}
if {$bulk_p == 1} {
- set bulk_actions [list "[_ project-manager.Close]" "@{base_url}bulk-close" "[_ project-manager.Close_project]"]
+ set bulk_actions [list "[_ project-manager.Close]" "@{base_url}/bulk-close" "[_ project-manager.Close_project]" ]
} else {
set bulk_actions [list]
}
if {$actions_p == 1} {
- set actions [list "[_ project-manager.Add_project]" "${base_url}add-edit" "[_ project-manager.Add_project]" "[_ project-manager.Customers]" "[site_node::get_package_url -package_key contacts]" "[_ project-manager.View_customers]"]
+
+ if {[info exists portal_info_name]} {
+
+ set actions [list "$portal_info_name" "$portal_info_url" "$portal_info_name" "[_ project-manager.Add_project]" "${base_url}/add-edit" "[_ project-manager.Add_project]" "[_ project-manager.Customers]" "[site_node::get_package_url -package_key contacts]" "[_ project-manager.View_customers]" ]
+
+ } else {
+
+ set actions [list "[_ project-manager.Add_project]" "${base_url}/add-edit" "[_ project-manager.Add_project]" "[_ project-manager.Customers]" "[site_node::get_package_url -package_key contacts]" "[_ project-manager.View_customers]" ]
+
+ }
+
} else {
- set actions [list]
+ set actions [list "Project: $community_name" "$base_url"]
}
template::list::create \
- -name projects \
- -multirow projects \
+ -name "projects_${package_id}" \
+ -multirow projects_${package_id} \
-selected_format $format \
-key project_item_id \
-elements {
@@ -152,15 +198,15 @@
}
earliest_finish_date {
label "[_ project-manager.Earliest_finish]"
- display_template "@projects.earliest_finish_date@@projects.earliest_finish_date@"
+ display_template "@projects_${package_id}.earliest_finish_date@@projects_${package_id}.earliest_finish_date@"
}
latest_finish_date {
label "[_ project-manager.Latest_Finish]"
- display_template "@projects.latest_finish_date@@projects.latest_finish_date@"
+ display_template "@projects${package_id}.latest_finish_date@@projects${package_id}.latest_finish_date@"
}
actual_hours_completed {
label "[_ project-manager.Hours_completed]"
- display_template "@projects.actual_hours_completed@/@projects.estimated_hours_total@"
+ display_template "@projects${package_id}.actual_hours_completed@/@projects.estimated_hours_total@"
}
category_id {
display_template ""
@@ -248,9 +294,16 @@
width 100%
}
-db_multirow -extend { item_url } projects project_folders {
+db_multirow -extend { item_url } "projects_${package_id}" project_folders {
} {
set item_url [export_vars -base "${base_url}one" {project_item_id}]
}
+
+
+}
+
+
+
+ad_return_template
# ------------------------- END OF FILE ------------------------- #
Index: openacs-4/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/index.tcl 26 May 2005 09:34:29 -0000 1.4
+++ openacs-4/packages/project-manager/www/index.tcl 16 Jun 2005 05:33:58 -0000 1.5
@@ -22,6 +22,7 @@
category_id:multiple,optional
{format "normal"}
{assignee_id ""}
+
} -properties {
context:onevalue
@@ -258,4 +259,5 @@
list::write_output -name projects
+
# ------------------------- END OF FILE ------------------------- #