Index: openacs-4/packages/project-manager/lib/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/forums-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/forums-portlet.tcl 26 May 2005 12:24:11 -0000 1.1
+++ openacs-4/packages/project-manager/lib/forums-portlet.tcl 1 Jun 2005 05:12:30 -0000 1.2
@@ -15,23 +15,21 @@
# Integrate with Forums
-if {$forum_id > 1} {
- # Get forum data
- if {[catch {forum::get -forum_id $forum_id -array forum} errMsg]} {
+# Get forum data
+if {[catch {forum::get -forum_id $forum_id -array forum} errMsg]} {
if {[string equal $::errorCode NOT_FOUND]} {
ns_returnnotfound
ad_script_abort
}
- error $errMsg $::errorInfo $::errorCode
- }
- forum::security::require_read_forum -forum_id $forum_id
- forum::security::permissions -forum_id $forum_id permissions
- set package_id [acs_object::get_element -object_id $forum_id -element package_id]
- set base_url [apm_package_url_from_id $package_id]
+ error $errMsg $::errorInfo $::errorCode
}
+forum::security::require_read_forum -forum_id $forum_id
+forum::security::permissions -forum_id $forum_id permissions
+set package_id [acs_object::get_element -object_id $forum_id -element package_id]
+set base_url [apm_package_url_from_id $package_id]
foreach optional_param {} {
if {![info exists $optional_param]} {
set $optional_param {}
}
-}
+}
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/fs-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/fs-portlet.adp 26 May 2005 12:47:26 -0000 1.2
+++ openacs-4/packages/project-manager/lib/fs-portlet.adp 1 Jun 2005 05:12:30 -0000 1.3
@@ -1,10 +1,10 @@
-#file-storage.File_storage#
+#file-storage.Folder#
|
|
-
\ No newline at end of file
+
Index: openacs-4/packages/project-manager/lib/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/fs-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/fs-portlet.tcl 26 May 2005 12:44:08 -0000 1.1
+++ openacs-4/packages/project-manager/lib/fs-portlet.tcl 1 Jun 2005 05:12:30 -0000 1.2
@@ -13,6 +13,5 @@
}
}
-
-set package_id [acs_object::get_element -object_id $folder_id -element package_id]
+set package_id [lindex [fs::get_folder_package_and_root $folder_id] 0]
set base_url [apm_package_url_from_id $package_id]
Index: openacs-4/packages/project-manager/lib/subprojects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/subprojects.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/subprojects.tcl 26 May 2005 09:34:27 -0000 1.1
+++ openacs-4/packages/project-manager/lib/subprojects.tcl 1 Jun 2005 05:12:30 -0000 1.2
@@ -5,17 +5,26 @@
# @arch-tag: 5b46d737-f74a-4069-9ae8-b833c6017a29
# @cvs-id $Id$
-foreach required_param {project_id project_item_id} {
+foreach required_param {} {
if {![info exists $required_param]} {
return -code error "$required_param is a required parameter."
}
}
-foreach optional_param {} {
+foreach optional_param {project_id project_item_id} {
if {![info exists $optional_param]} {
set $optional_param {}
}
}
+if {[empty_string_p $project_item_id]} {
+ if {[empty_string_p $project_id]} {
+ return -code error "You have to provide either project_id or project_item_id"
+ } else {
+ set project_item_id [pm::project::get_project_item_id -project_id $project_id]
+ }
+}
+
+set user_id [auth::require_login]
# Subprojects, using list-builder ---------------------------------
template::list::create \
@@ -24,7 +33,7 @@
-key item_id \
-elements {
project_name {
- label "<#_Subject#>"
+ label "[_ project-manager.Subject]"
link_url_col item_url
link_html {title "[_ project-manager._View]" }
}
Index: openacs-4/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/add-edit.tcl 26 May 2005 09:34:29 -0000 1.4
+++ openacs-4/packages/project-manager/www/add-edit.tcl 1 Jun 2005 05:12:30 -0000 1.5
@@ -259,7 +259,7 @@
-object_id $project_id \
-form add_edit \
-cr_widget none \
- -defaults [list title $project_name description $description mime_type "text/plain" context_id $parent_id parent_id $folder_id] \
+ -defaults [list title $project_name description $description mime_type "text/plain" context_id $parent_id parent_id $parent_id] \
-default_fields {project_code goal {planned_start_date $planned_start_date_sql} {planned_end_date $planned_end_date_sql} actual_start_date actual_end_date ongoing_p status_id customer_id logger_project} \
-exclude_static]
@@ -315,7 +315,7 @@
-object_id $project_id \
-form add_edit \
-cr_widget none \
- -defaults [list title $project_name description $description mime_type "text/plain" context_id $parent_id parent_id $folder_id] \
+ -defaults [list title $project_name description $description mime_type "text/plain" context_id $parent_id parent_id $parent_id] \
-default_fields {project_code goal {planned_start_date $planned_start_date_sql} {planned_end_date $planned_end_date_sql} actual_start_date actual_end_date ongoing_p status_id customer_id logger_project} \
-exclude_static]