Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -r1.20 -r1.21
--- openacs-4/contrib/packages/project-manager/project-manager.info 14 May 2004 23:08:55 -0000 1.20
+++ openacs-4/contrib/packages/project-manager/project-manager.info 19 May 2004 23:13:23 -0000 1.21
@@ -7,14 +7,14 @@
f
f
-
+
Jade Rubick
Project management tool for OpenACS
- 2004-05-14
+ 2004-05-19
Integrated Bakery Resources
Track tasks, estimates and actual progress for a project. See the <a href="http://openacs.org/projects/dotwrk/project_management/">project page</a> for more information.
-
+
@@ -24,8 +24,8 @@
-
+
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-functions-create.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 14 May 2004 23:08:56 -0000 1.15
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 19 May 2004 23:13:23 -0000 1.16
@@ -19,9 +19,9 @@
returns varchar as '
declare
p_pm_project_id alias for $1;
- v_pm_project_name pm_projects.project_name%TYPE;
+ v_pm_project_name pm_projectsx.name%TYPE;
begin
- select project_name || ''_'' || p_pm_project_id into v_pm_project_name
+ select name || ''_'' || p_pm_project_id into v_pm_project_name
from pm_projectsx
where item_id = p_pm_project_id;
return v_pm_project_name;
@@ -51,7 +51,7 @@
v_folder_name, -- name
''Projects'', -- label
''Project Repository'', -- description
- null -- parent_id
+ p_package_id -- parent_id
);
-- Register the standard content types
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/upgrade/upgrade-1.03-1.04b1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/upgrade/Attic/upgrade-1.03-1.04b1.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/upgrade/upgrade-1.03-1.04b1.sql 19 May 2004 23:13:24 -0000 1.1
@@ -0,0 +1,70 @@
+--
+--
+--
+-- @author Jade Rubick (jader@bread.com)
+-- @creation-date 2004-05-19
+-- @arch-tag: 551cfc66-62c5-4f75-a321-e879d75b44b1
+-- @cvs-id $Id: upgrade-1.03-1.04b1.sql,v 1.1 2004/05/19 23:13:24 jader Exp $
+--
+
+-- fixes name function
+
+create or replace function pm_project__name (integer)
+returns varchar as '
+declare
+ p_pm_project_id alias for $1;
+ v_pm_project_name pm_projectsx.name%TYPE;
+begin
+ select name || ''_'' || p_pm_project_id into v_pm_project_name
+ from pm_projectsx
+ where item_id = p_pm_project_id;
+ return v_pm_project_name;
+end;
+' language 'plpgsql';
+
+
+-- untested fix for bug #1796
+
+create or replace function pm_project__new_root_folder (integer)
+returns integer as '
+declare
+ p_package_id alias for $1;
+
+ v_folder_id cr_folders.folder_id%TYPE;
+ v_folder_name cr_items.name%TYPE;
+begin
+
+ -- raise notice ''in new root folder'';
+
+ -- Set the folder name
+ v_folder_name := pm_project__new_unique_name (p_package_id);
+
+ v_folder_id := content_folder__new (
+ v_folder_name, -- name
+ ''Projects'', -- label
+ ''Project Repository'', -- description
+ p_package_id -- parent_id
+ );
+
+ -- Register the standard content types
+ PERFORM content_folder__register_content_type (
+ v_folder_id, -- folder_id
+ ''pm_project'', -- content_type
+ ''f'' -- include_subtypes
+ );
+
+ -- there is no facility in the API for adding in the package_id,
+ -- so we have to do it ourselves
+
+ update cr_folders
+ set package_id = p_package_id
+ where folder_id = v_folder_id;
+
+ -- TODO: Handle Permissions here for this folder.
+
+ return v_folder_id;
+end;' language 'plpgsql';
+
+-- upgrade script to fix bug #1796
+
+update cr_items set parent_id = (select package_id from cr_folders where folder_id = item_id and label = 'Projects') where item_id = (select folder_id from cr_folders where label = 'Projects');
Index: openacs-4/contrib/packages/project-manager/www/log-bulk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/log-bulk.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/www/log-bulk.tcl 27 Apr 2004 00:49:29 -0000 1.1
+++ openacs-4/contrib/packages/project-manager/www/log-bulk.tcl 19 May 2004 23:13:24 -0000 1.2
@@ -18,10 +18,14 @@
} -errors {
}
+set package_id [ad_conn package_id]
+set user_id [ad_maybe_redirect_for_registration]
+
set title "Log time for multiple tasks"
if {[exists_and_not_null return_url]} {
set context [list [list $return_url Tasks] "Log time"]
} else {
set context [list "Log time"]
}
+