Menu
▾
▴
Re: [mantisbt-dev] [mantisbt-commits] mantisbt.git branch, master, updated. release-1.2.0rc1-950-g08c027a
|
From: Victor B. <vb...@gm...> - 2011-02-26 14:21:07
|
David,
Should the following check also check for FTP upload method? In case of the
FTP method, we should move the local file? I know that FTP support is not
great, but we should avoid breaking it since there are users that are
actually using it for the backup benefit.
+ $t_method = config_get( 'file_upload_method' );
+ if ( $t_method != DISK ) {
+ return;
+ }
On Sat, Feb 26, 2011 at 5:05 AM, <gi...@ma...> wrote:
> The branch, master has been updated
> via 08c027af59b88a6934377d71d19a86edfd7d12dd (commit)
> from a3f376d1448cdba3378ae9869fa7ea1a7dad14f4 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> commit 08c027af59b88a6934377d71d19a86edfd7d12dd
> Author: Jacob Hoover <jac...@gr...>
> Date: Sat Feb 26 21:03:12 2011 +1100
>
> Fix #11687: Bugs with attachments that are moved will lose attachments
>
> When a bug is logged and assigned to a project which has a project path
> assigned, and later a mantis "administrator" moves the bug from the
> initial project to a new project, the attachments are lost.
>
> Jacob's initial patch from mid 2010 has been updated to work with the
> latest version of MantisBT 1.3.x. Furthermore the patch has been cleaned
> up and simplified. Needs testing however!
>
> Signed-off-by: David Hicks <hic...@op...>
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> core/bug_api.php | 5 +++-
> core/file_api.php | 69
> +++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 73 insertions(+), 1 deletions(-)
>
> -----------------------------------------------------------------------
>
> commit 08c027af59b88a6934377d71d19a86edfd7d12dd
> Author: Jacob Hoover <jac...@gr...>
> Date: Sat Feb 26 21:03:12 2011 +1100
>
> Fix #11687: Bugs with attachments that are moved will lose attachments
>
> When a bug is logged and assigned to a project which has a project path
> assigned, and later a mantis "administrator" moves the bug from the
> initial project to a new project, the attachments are lost.
>
> Jacob's initial patch from mid 2010 has been updated to work with the
> latest version of MantisBT 1.3.x. Furthermore the patch has been cleaned
> up and simplified. Needs testing however!
>
> Signed-off-by: David Hicks <hic...@op...>
>
> diff --git a/core/bug_api.php b/core/bug_api.php
> index 0530adb..0f7d371 100644
> --- a/core/bug_api.php
> +++ b/core/bug_api.php
> @@ -1089,13 +1089,16 @@ function bug_copy( $p_bug_id, $p_target_project_id
> = null, $p_copy_custom_fields
>
> /**
> * Moves an issue from a project to another.
> + *
> * @todo Validate with sub-project / category inheritance scenarios.
> - * @todo Fix #11687: Bugs with attachments that are moved will lose
> attachments.
> * @param int p_bug_id The bug to be moved.
> * @param int p_target_project_id The target project to move the bug to.
> * @access public
> */
> function bug_move( $p_bug_id, $p_target_project_id ) {
> + // Attempt to move disk based attachments to new project file
> directory.
> + file_move_bug_attachments( $p_bug_id, $p_target_project_id );
> +
> // Move the issue to the new project.
> bug_set_field( $p_bug_id, 'project_id', $p_target_project_id );
>
> diff --git a/core/file_api.php b/core/file_api.php
> index 14e8d99..247eea3 100644
> --- a/core/file_api.php
> +++ b/core/file_api.php
> @@ -970,3 +970,72 @@ function file_get_content( $p_file_id, $p_type = 'bug'
> ) {
> break;
> }
> }
> +
> +/**
> + * Move any attachments as needed when a bug is moved from project to
> project.
> + *
> + * @param int $p_bug_id ID of bug containing attachments to be moved
> + * @param int $p_project_id_to destination project ID for the bug
> + * @return null
> + */
> +function file_move_bug_attachments( $p_bug_id, $p_project_id_to ) {
> + $t_project_id_from = bug_get_field( $p_bug_id, 'project_id' );
> + if ( $t_project_id_from == $p_project_id_to ) {
> + return;
> + }
> +
> + $t_method = config_get( 'file_upload_method' );
> + if ( $t_method != DISK ) {
> + return;
> + }
> +
> + if ( !file_bug_has_attachments( $p_bug_id ) ) {
> + return;
> + }
> +
> + $t_path_from = project_get_field( $t_project_id_from, 'file_path'
> );
> + if ( is_blank( $t_path_from ) ) {
> + $t_path_from = config_get(
> 'absolute_path_default_upload_folder', null, null, $t_project_id_from );
> + }
> + file_ensure_valid_upload_path( $t_path_from );
> + $t_path_to = project_get_field( $p_project_id_to, 'file_path' );
> + if ( is_blank( $t_path_to ) ) {
> + $t_path_to = config_get(
> 'absolute_path_default_upload_folder', null, null, $p_project_id_to );
> + }
> + file_ensure_valid_upload_path( $t_path_to );
> + if ( $t_path_from == $t_path_to ) {
> + return;
> + }
> +
> + # Initialize the update query to update a single row
> + $t_bug_file_table = db_get_table( 'bug_file' );
> + $c_bug_id = db_prepare_int( $p_bug_id );
> + $query_disk_attachment_update = "UPDATE $t_bug_file_table
> + SET folder=" . db_param() . "
> + WHERE bug_id=" . db_param() . "
> + AND id =" . db_param();
> +
> + $t_attachment_rows = bug_get_attachments( $p_bug_id );
> + $t_attachments_count = count( $t_attachment_rows );
> + for ( $i = 0; $i < $t_attachments_count; $i++ ) {
> + $t_row = $t_attachment_rows[$i];
> + $t_basename = basename( $t_row['diskfile'] );
> +
> + $t_disk_file_name_from = file_path_combine( $t_path_from,
> $t_basename );
> + $t_disk_file_name_to = file_path_combine( $t_path_to,
> $t_basename );
> +
> + if ( !file_exists( $t_disk_file_name_to ) ) {
> + chmod( $t_disk_file_name_from, 0775 );
> + if ( !rename( $t_disk_file_name_from,
> $t_disk_file_name_to ) ) {
> + if ( !copy( $t_disk_file_name_from,
> $t_disk_file_name_to ) ) {
> + trigger_error( FILE_MOVE_FAILED,
> ERROR );
> + }
> + file_delete_local( $t_disk_file_name_from
> );
> + }
> + chmod( $t_disk_file_name_to, config_get(
> 'attachments_file_permissions' ) );
> + db_query_bound( $query_disk_attachment_update,
> Array( db_prepare_string( $t_path_to ), $c_bug_id, db_prepare_int(
> $t_row['id'] ) ) );
> + } else {
> + trigger_error( ERROR_FILE_DUPLICATE, ERROR );
> + }
> + }
> +}
>
> -----------------------------------------------------------------------
>
>
> --
> Mantis Bug Tracker
>
>
> ------------------------------------------------------------------------------
> Free Software Download: Index, Search & Analyze Logs and other IT data in
> Real-Time with Splunk. Collect, index and harness all the fast moving IT
> data
> generated by your applications, servers and devices whether physical,
> virtual
> or in the cloud. Deliver compliance at lower cost and gain new business
> insights. http://p.sf.net/sfu/splunk-dev2dev
> _______________________________________________
> mantisbt-cvs mailing list
> man...@li...
> https://lists.sourceforge.net/lists/listinfo/mantisbt-cvs
>
|