Fixed the review backend to support multiple patches per review and line level comments.
This commit is contained in:
Loic d'Anterroches
143
src/IDF/Review/Comment.php
Normal file
143
src/IDF/Review/Comment.php
Normal file
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# This file is part of InDefero, an open source project management application.
|
||||
# Copyright (C) 2008 Céondo Ltd and contributors.
|
||||
#
|
||||
# InDefero is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# InDefero is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
# ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/**
|
||||
* A comment set on a review.
|
||||
*
|
||||
* A comment is associated to a patch as a review can have many
|
||||
* patches associated to it.
|
||||
*
|
||||
* A comment is also tracking the changes in the review in the same
|
||||
* way the issue comment is tracking the changes in the issue.
|
||||
*
|
||||
*
|
||||
*/
|
||||
class IDF_Review_Comment extends Pluf_Model
|
||||
{
|
||||
public $_model = __CLASS__;
|
||||
|
||||
function init()
|
||||
{
|
||||
$this->_a['table'] = 'idf_review_comments';
|
||||
$this->_a['model'] = __CLASS__;
|
||||
$this->_a['cols'] = array(
|
||||
// It is mandatory to have an "id" column.
|
||||
'id' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Sequence',
|
||||
'blank' => true,
|
||||
),
|
||||
'patch' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Foreignkey',
|
||||
'model' => 'IDF_Review_Patch',
|
||||
'blank' => false,
|
||||
'verbose' => __('patch'),
|
||||
'relate_name' => 'comments',
|
||||
),
|
||||
'content' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Text',
|
||||
'blank' => true, // if only commented on lines
|
||||
'verbose' => __('comment'),
|
||||
),
|
||||
'submitter' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Foreignkey',
|
||||
'model' => 'Pluf_User',
|
||||
'blank' => false,
|
||||
'verbose' => __('submitter'),
|
||||
),
|
||||
'changes' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Serialized',
|
||||
'blank' => true,
|
||||
'verbose' => __('changes'),
|
||||
'help_text' => 'Serialized array of the changes in the review.',
|
||||
),
|
||||
'vote' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Integer',
|
||||
'default' => 0,
|
||||
'blank' => true,
|
||||
'verbose' => __('vote'),
|
||||
'help_text' => '1, 0 or -1 for positive, neutral or negative vote.',
|
||||
),
|
||||
'creation_dtime' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Datetime',
|
||||
'blank' => true,
|
||||
'verbose' => __('creation date'),
|
||||
'index' => true,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
function changedReview()
|
||||
{
|
||||
return (is_array($this->changes) and count($this->changes) > 0);
|
||||
}
|
||||
|
||||
function _toIndex()
|
||||
{
|
||||
return $this->content;
|
||||
}
|
||||
|
||||
function preDelete()
|
||||
{
|
||||
IDF_Timeline::remove($this);
|
||||
}
|
||||
|
||||
function preSave($create=false)
|
||||
{
|
||||
if ($create) {
|
||||
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
||||
}
|
||||
}
|
||||
|
||||
function postSave($create=false)
|
||||
{
|
||||
if (0 and $create) {
|
||||
// Check if more than one comment for this patch. We do
|
||||
// not want to insert the first comment in the timeline as
|
||||
// the patch itself is inserted.
|
||||
$sql = new Pluf_SQL('patch=%s', array($this->patch));
|
||||
$co = Pluf::factory(__CLASS__)->getList(array('filter'=>$sql->gen()));
|
||||
if ($co->count() > 1) {
|
||||
IDF_Timeline::insert($this, $this->get_patch()->get_review()->get_project(),
|
||||
$this->get_submitter());
|
||||
}
|
||||
}
|
||||
IDF_Search::index($this->get_patch()->get_review());
|
||||
}
|
||||
|
||||
public function timelineFragment($request)
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function feedFragment($request)
|
||||
{
|
||||
return '';
|
||||
}
|
||||
}
|
||||
@@ -40,13 +40,13 @@ class IDF_Review_FileComment extends Pluf_Model
|
||||
'type' => 'Pluf_DB_Field_Sequence',
|
||||
'blank' => true,
|
||||
),
|
||||
'patch' =>
|
||||
'comment' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Foreignkey',
|
||||
'model' => 'IDF_Review_Patch',
|
||||
'model' => 'IDF_Review_Comment',
|
||||
'blank' => false,
|
||||
'verbose' => __('patch'),
|
||||
'relate_name' => 'filecomments',
|
||||
'verbose' => __('comment'),
|
||||
),
|
||||
'cfile' =>
|
||||
array(
|
||||
@@ -55,32 +55,25 @@ class IDF_Review_FileComment extends Pluf_Model
|
||||
'size' => 250,
|
||||
'help_text' => 'The changed file, for example src/foo/bar.txt, this is the path to access it in the repository.',
|
||||
),
|
||||
'cline' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Integer',
|
||||
'blank' => false,
|
||||
'default' => 0,
|
||||
'help_text' => 'The commented line, negative value is the old file, positive the new, 0 general comment.',
|
||||
),
|
||||
'content' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Text',
|
||||
'blank' => false,
|
||||
'verbose' => __('comment'),
|
||||
),
|
||||
'submitter' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Foreignkey',
|
||||
'model' => 'Pluf_User',
|
||||
'blank' => false,
|
||||
'verbose' => __('submitter'),
|
||||
'relate_name' => 'commented_patched_files',
|
||||
),
|
||||
'creation_dtime' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Datetime',
|
||||
'blank' => true,
|
||||
'verbose' => __('creation date'),
|
||||
),
|
||||
);
|
||||
$this->_a['idx'] = array(
|
||||
'creation_dtime_idx' =>
|
||||
array(
|
||||
'col' => 'creation_dtime',
|
||||
'type' => 'normal',
|
||||
'index' => true,
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -92,12 +85,11 @@ class IDF_Review_FileComment extends Pluf_Model
|
||||
|
||||
function preDelete()
|
||||
{
|
||||
IDF_Timeline::remove($this);
|
||||
}
|
||||
|
||||
function preSave($create=false)
|
||||
{
|
||||
if ($this->id == '') {
|
||||
if ($create) {
|
||||
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,15 +85,28 @@ class IDF_Review_Patch extends Pluf_Model
|
||||
'type' => 'Pluf_DB_Field_Datetime',
|
||||
'blank' => true,
|
||||
'verbose' => __('creation date'),
|
||||
'index' => true,
|
||||
),
|
||||
);
|
||||
$this->_a['idx'] = array(
|
||||
'creation_dtime_idx' =>
|
||||
array(
|
||||
'col' => 'creation_dtime',
|
||||
'type' => 'normal',
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the list of file comments.
|
||||
*
|
||||
* It will go through the patch comments and find for each the
|
||||
* file comments.
|
||||
*
|
||||
* @param array Filter to apply to the file comment list (array())
|
||||
*/
|
||||
function getFileComments($filter=array())
|
||||
{
|
||||
$files = new ArrayObject();
|
||||
foreach ($this->get_comments_list(array('order'=>'creation_dtime ASC')) as $ct) {
|
||||
foreach ($ct->get_filecomments_list($filter) as $fc) {
|
||||
$files[] = $fc;
|
||||
}
|
||||
}
|
||||
return $files;
|
||||
}
|
||||
|
||||
function _toIndex()
|
||||
@@ -107,7 +120,7 @@ class IDF_Review_Patch extends Pluf_Model
|
||||
|
||||
function preSave($create=false)
|
||||
{
|
||||
if ($this->id == '') {
|
||||
if ($create) {
|
||||
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
||||
}
|
||||
}
|
||||
@@ -118,6 +131,7 @@ class IDF_Review_Patch extends Pluf_Model
|
||||
|
||||
public function timelineFragment($request)
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function feedFragment($request)
|
||||
|
||||
Reference in New Issue
Block a user