Fixed the review backend to support multiple patches per review and line level comments.
This commit is contained in:
parent
dd56d681b3
commit
99992442f5
@ -1,203 +0,0 @@
|
|||||||
<?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 ***** */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new documentation page.
|
|
||||||
*
|
|
||||||
* This create a new page and the corresponding revision.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
class IDF_Form_WikiCreate extends Pluf_Form
|
|
||||||
{
|
|
||||||
public $user = null;
|
|
||||||
public $project = null;
|
|
||||||
public $show_full = false;
|
|
||||||
|
|
||||||
public function initFields($extra=array())
|
|
||||||
{
|
|
||||||
$initial = __('# Introduction
|
|
||||||
|
|
||||||
Add your content here.
|
|
||||||
|
|
||||||
|
|
||||||
# Details
|
|
||||||
|
|
||||||
Add your content here. Format your content with:
|
|
||||||
|
|
||||||
* Text in **bold** or *italic*.
|
|
||||||
* Headings, paragraphs, and lists.
|
|
||||||
* Links to other [[WikiPage]].
|
|
||||||
');
|
|
||||||
$this->user = $extra['user'];
|
|
||||||
$this->project = $extra['project'];
|
|
||||||
if ($this->user->hasPerm('IDF.project-owner', $this->project)
|
|
||||||
or $this->user->hasPerm('IDF.project-member', $this->project)) {
|
|
||||||
$this->show_full = true;
|
|
||||||
}
|
|
||||||
$this->fields['title'] = new Pluf_Form_Field_Varchar(
|
|
||||||
array('required' => true,
|
|
||||||
'label' => __('Page title'),
|
|
||||||
'initial' => __('PageName'),
|
|
||||||
'widget_attrs' => array(
|
|
||||||
'maxlength' => 200,
|
|
||||||
'size' => 67,
|
|
||||||
),
|
|
||||||
'help_text' => __('The page name must contains only letters, digits and the dash (-) character.'),
|
|
||||||
));
|
|
||||||
$this->fields['summary'] = new Pluf_Form_Field_Varchar(
|
|
||||||
array('required' => true,
|
|
||||||
'label' => __('Description'),
|
|
||||||
'help_text' => __('This one line description is displayed in the list of pages.'),
|
|
||||||
'initial' => '',
|
|
||||||
'widget_attrs' => array(
|
|
||||||
'maxlength' => 200,
|
|
||||||
'size' => 67,
|
|
||||||
),
|
|
||||||
));
|
|
||||||
$this->fields['content'] = new Pluf_Form_Field_Varchar(
|
|
||||||
array('required' => true,
|
|
||||||
'label' => __('Content'),
|
|
||||||
'initial' => $initial,
|
|
||||||
'widget' => 'Pluf_Form_Widget_TextareaInput',
|
|
||||||
'widget_attrs' => array(
|
|
||||||
'cols' => 58,
|
|
||||||
'rows' => 26,
|
|
||||||
),
|
|
||||||
));
|
|
||||||
|
|
||||||
if ($this->show_full) {
|
|
||||||
for ($i=1;$i<4;$i++) {
|
|
||||||
$this->fields['label'.$i] = new Pluf_Form_Field_Varchar(
|
|
||||||
array('required' => false,
|
|
||||||
'label' => __('Labels'),
|
|
||||||
'initial' => '',
|
|
||||||
'widget_attrs' => array(
|
|
||||||
'maxlength' => 50,
|
|
||||||
'size' => 20,
|
|
||||||
),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function clean_title()
|
|
||||||
{
|
|
||||||
$title = $this->cleaned_data['title'];
|
|
||||||
if (preg_match('/[^a-zA-Z0-9\-]/', $title)) {
|
|
||||||
throw new Pluf_Form_Invalid(__('The title contains invalid characters.'));
|
|
||||||
}
|
|
||||||
$sql = new Pluf_SQL('project=%s AND title=%s',
|
|
||||||
array($this->project->id, $title));
|
|
||||||
$pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));
|
|
||||||
if ($pages->count() > 0) {
|
|
||||||
throw new Pluf_Form_Invalid(__('A page with this title already exists.'));
|
|
||||||
}
|
|
||||||
return $title;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Validate the interconnection in the form.
|
|
||||||
*/
|
|
||||||
public function clean()
|
|
||||||
{
|
|
||||||
if (!$this->show_full) {
|
|
||||||
return $this->cleaned_data;
|
|
||||||
}
|
|
||||||
$conf = new IDF_Conf();
|
|
||||||
$conf->setProject($this->project);
|
|
||||||
$onemax = array();
|
|
||||||
foreach (split(',', $conf->getVal('labels_wiki_one_max', IDF_Form_WikiConf::init_one_max)) as $class) {
|
|
||||||
if (trim($class) != '') {
|
|
||||||
$onemax[] = mb_strtolower(trim($class));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$count = array();
|
|
||||||
for ($i=1;$i<4;$i++) {
|
|
||||||
$this->cleaned_data['label'.$i] = trim($this->cleaned_data['label'.$i]);
|
|
||||||
if (strpos($this->cleaned_data['label'.$i], ':') !== false) {
|
|
||||||
list($class, $name) = explode(':', $this->cleaned_data['label'.$i], 2);
|
|
||||||
list($class, $name) = array(mb_strtolower(trim($class)),
|
|
||||||
trim($name));
|
|
||||||
} else {
|
|
||||||
$class = 'other';
|
|
||||||
$name = $this->cleaned_data['label'.$i];
|
|
||||||
}
|
|
||||||
if (!isset($count[$class])) $count[$class] = 1;
|
|
||||||
else $count[$class] += 1;
|
|
||||||
if (in_array($class, $onemax) and $count[$class] > 1) {
|
|
||||||
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
|
|
||||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to a page.'), $class);
|
|
||||||
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $this->cleaned_data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save the model in the database.
|
|
||||||
*
|
|
||||||
* @param bool Commit in the database or not. If not, the object
|
|
||||||
* is returned but not saved in the database.
|
|
||||||
* @return Object Model with data set from the form.
|
|
||||||
*/
|
|
||||||
function save($commit=true)
|
|
||||||
{
|
|
||||||
if (!$this->isValid()) {
|
|
||||||
throw new Exception(__('Cannot save the model from an invalid form.'));
|
|
||||||
}
|
|
||||||
// Add a tag for each label
|
|
||||||
$tags = array();
|
|
||||||
if ($this->show_full) {
|
|
||||||
for ($i=1;$i<4;$i++) {
|
|
||||||
if (strlen($this->cleaned_data['label'.$i]) > 0) {
|
|
||||||
if (strpos($this->cleaned_data['label'.$i], ':') !== false) {
|
|
||||||
list($class, $name) = explode(':', $this->cleaned_data['label'.$i], 2);
|
|
||||||
list($class, $name) = array(trim($class), trim($name));
|
|
||||||
} else {
|
|
||||||
$class = 'Other';
|
|
||||||
$name = trim($this->cleaned_data['label'.$i]);
|
|
||||||
}
|
|
||||||
$tags[] = IDF_Tag::add($name, $this->project, $class);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Create the page
|
|
||||||
$page = new IDF_WikiPage();
|
|
||||||
$page->project = $this->project;
|
|
||||||
$page->submitter = $this->user;
|
|
||||||
$page->summary = trim($this->cleaned_data['summary']);
|
|
||||||
$page->title = trim($this->cleaned_data['title']);
|
|
||||||
$page->create();
|
|
||||||
foreach ($tags as $tag) {
|
|
||||||
$page->setAssoc($tag);
|
|
||||||
}
|
|
||||||
// add the first revision
|
|
||||||
$rev = new IDF_WikiRevision();
|
|
||||||
$rev->wikipage = $page;
|
|
||||||
$rev->content = $this->cleaned_data['content'];
|
|
||||||
$rev->submitter = $this->user;
|
|
||||||
$rev->summary = __('Initial page creation');
|
|
||||||
$rev->create();
|
|
||||||
return $page;
|
|
||||||
}
|
|
||||||
}
|
|
@ -76,13 +76,17 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
|
|||||||
if (!$this->isValid()) {
|
if (!$this->isValid()) {
|
||||||
throw new Exception(__('Cannot save the model from an invalid form.'));
|
throw new Exception(__('Cannot save the model from an invalid form.'));
|
||||||
}
|
}
|
||||||
|
// create a base comment
|
||||||
|
$bc = new IDF_Review_Comment();
|
||||||
|
$bc->patch = $this->patch;
|
||||||
|
$bc->submitter = $this->user;
|
||||||
|
$bc->create();
|
||||||
foreach ($this->files as $filename => $def) {
|
foreach ($this->files as $filename => $def) {
|
||||||
if (!empty($this->cleaned_data[md5($filename)])) {
|
if (!empty($this->cleaned_data[md5($filename)])) {
|
||||||
// Add a comment.
|
// Add a comment.
|
||||||
$c = new IDF_Review_FileComment();
|
$c = new IDF_Review_FileComment();
|
||||||
$c->patch = $this->patch;
|
$c->comment = $bc;
|
||||||
$c->cfile = $filename;
|
$c->cfile = $filename;
|
||||||
$c->submitter = $this->user;
|
|
||||||
$c->content = $this->cleaned_data[md5($filename)];
|
$c->content = $this->cleaned_data[md5($filename)];
|
||||||
$c->create();
|
$c->create();
|
||||||
}
|
}
|
||||||
|
60
src/IDF/Migrations/13NewReview.php
Normal file
60
src/IDF/Migrations/13NewReview.php
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
<?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 ***** */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove the old review and add the new one.
|
||||||
|
*
|
||||||
|
* This is a destructive operation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function IDF_Migrations_13NewReview_up($params=null)
|
||||||
|
{
|
||||||
|
$extra = (Pluf::f('db_engine') == 'PostgreSQL') ? ' CASCADE' : '';
|
||||||
|
$pfx = Pluf::f('db_table_prefix');
|
||||||
|
$tables = array('idf_review_filecomments',
|
||||||
|
'idf_review_patches',
|
||||||
|
'idf_review_pluf_user_assoc',
|
||||||
|
'idf_review_idf_tag_assoc',
|
||||||
|
'idf_reviews');
|
||||||
|
$db = Pluf::db();
|
||||||
|
foreach ($tables as $table) {
|
||||||
|
$db->execute('DROP TABLE IF EXISTS '.$pfx.$table.$extra);
|
||||||
|
}
|
||||||
|
$models = array(
|
||||||
|
'IDF_Review',
|
||||||
|
'IDF_Review_Patch',
|
||||||
|
'IDF_Review_Comment',
|
||||||
|
'IDF_Review_FileComment',
|
||||||
|
);
|
||||||
|
$db = Pluf::db();
|
||||||
|
$schema = new Pluf_DB_Schema($db);
|
||||||
|
foreach ($models as $model) {
|
||||||
|
$schema->model = new $model();
|
||||||
|
$schema->createTables();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function IDF_Migrations_13NewReview_down($params=null)
|
||||||
|
{
|
||||||
|
// We do nothing as we cannot go back to the old reviews
|
||||||
|
}
|
@ -43,6 +43,7 @@ function IDF_Migrations_Install_setup($params=null)
|
|||||||
'IDF_WikiPage',
|
'IDF_WikiPage',
|
||||||
'IDF_WikiRevision',
|
'IDF_WikiRevision',
|
||||||
'IDF_Review',
|
'IDF_Review',
|
||||||
|
'IDF_Review_Comment',
|
||||||
'IDF_Review_Patch',
|
'IDF_Review_Patch',
|
||||||
'IDF_Review_FileComment',
|
'IDF_Review_FileComment',
|
||||||
'IDF_Key',
|
'IDF_Key',
|
||||||
@ -88,6 +89,7 @@ function IDF_Migrations_Install_teardown($params=null)
|
|||||||
'IDF_Key',
|
'IDF_Key',
|
||||||
'IDF_Review_FileComment',
|
'IDF_Review_FileComment',
|
||||||
'IDF_Review_Patch',
|
'IDF_Review_Patch',
|
||||||
|
'IDF_Review_Comment',
|
||||||
'IDF_Review',
|
'IDF_Review',
|
||||||
'IDF_WikiRevision',
|
'IDF_WikiRevision',
|
||||||
'IDF_WikiPage',
|
'IDF_WikiPage',
|
||||||
|
@ -126,11 +126,25 @@ class IDF_Review extends Pluf_Model
|
|||||||
'join_tags' =>
|
'join_tags' =>
|
||||||
array(
|
array(
|
||||||
'join' => 'LEFT JOIN '.$table
|
'join' => 'LEFT JOIN '.$table
|
||||||
.' ON idf_issue_id=id',
|
.' ON idf_review_id=id',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Iterate through the patches and comments to get the reviewers.
|
||||||
|
*/
|
||||||
|
function getReviewers()
|
||||||
|
{
|
||||||
|
$rev = new ArrayObject();
|
||||||
|
foreach ($this->get_patches_list() as $p) {
|
||||||
|
foreach ($p->get_comments_list() as $c) {
|
||||||
|
$rev[] = $c->get_submitter();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Pluf_Model_RemoveDuplicates($rev);
|
||||||
|
}
|
||||||
|
|
||||||
function __toString()
|
function __toString()
|
||||||
{
|
{
|
||||||
return $this->id.' - '.$this->summary;
|
return $this->id.' - '.$this->summary;
|
||||||
@ -149,7 +163,7 @@ class IDF_Review extends Pluf_Model
|
|||||||
|
|
||||||
function preSave($create=false)
|
function preSave($create=false)
|
||||||
{
|
{
|
||||||
if ($this->id == '') {
|
if ($create) {
|
||||||
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
||||||
}
|
}
|
||||||
$this->modif_dtime = gmdate('Y-m-d H:i:s');
|
$this->modif_dtime = gmdate('Y-m-d H:i:s');
|
||||||
|
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',
|
'type' => 'Pluf_DB_Field_Sequence',
|
||||||
'blank' => true,
|
'blank' => true,
|
||||||
),
|
),
|
||||||
'patch' =>
|
'comment' =>
|
||||||
array(
|
array(
|
||||||
'type' => 'Pluf_DB_Field_Foreignkey',
|
'type' => 'Pluf_DB_Field_Foreignkey',
|
||||||
'model' => 'IDF_Review_Patch',
|
'model' => 'IDF_Review_Comment',
|
||||||
'blank' => false,
|
'blank' => false,
|
||||||
'verbose' => __('patch'),
|
|
||||||
'relate_name' => 'filecomments',
|
'relate_name' => 'filecomments',
|
||||||
|
'verbose' => __('comment'),
|
||||||
),
|
),
|
||||||
'cfile' =>
|
'cfile' =>
|
||||||
array(
|
array(
|
||||||
@ -55,32 +55,25 @@ class IDF_Review_FileComment extends Pluf_Model
|
|||||||
'size' => 250,
|
'size' => 250,
|
||||||
'help_text' => 'The changed file, for example src/foo/bar.txt, this is the path to access it in the repository.',
|
'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' =>
|
'content' =>
|
||||||
array(
|
array(
|
||||||
'type' => 'Pluf_DB_Field_Text',
|
'type' => 'Pluf_DB_Field_Text',
|
||||||
'blank' => false,
|
'blank' => false,
|
||||||
'verbose' => __('comment'),
|
'verbose' => __('comment'),
|
||||||
),
|
),
|
||||||
'submitter' =>
|
|
||||||
array(
|
|
||||||
'type' => 'Pluf_DB_Field_Foreignkey',
|
|
||||||
'model' => 'Pluf_User',
|
|
||||||
'blank' => false,
|
|
||||||
'verbose' => __('submitter'),
|
|
||||||
'relate_name' => 'commented_patched_files',
|
|
||||||
),
|
|
||||||
'creation_dtime' =>
|
'creation_dtime' =>
|
||||||
array(
|
array(
|
||||||
'type' => 'Pluf_DB_Field_Datetime',
|
'type' => 'Pluf_DB_Field_Datetime',
|
||||||
'blank' => true,
|
'blank' => true,
|
||||||
'verbose' => __('creation date'),
|
'verbose' => __('creation date'),
|
||||||
),
|
'index' => true,
|
||||||
);
|
|
||||||
$this->_a['idx'] = array(
|
|
||||||
'creation_dtime_idx' =>
|
|
||||||
array(
|
|
||||||
'col' => 'creation_dtime',
|
|
||||||
'type' => 'normal',
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -92,12 +85,11 @@ class IDF_Review_FileComment extends Pluf_Model
|
|||||||
|
|
||||||
function preDelete()
|
function preDelete()
|
||||||
{
|
{
|
||||||
IDF_Timeline::remove($this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function preSave($create=false)
|
function preSave($create=false)
|
||||||
{
|
{
|
||||||
if ($this->id == '') {
|
if ($create) {
|
||||||
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
$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',
|
'type' => 'Pluf_DB_Field_Datetime',
|
||||||
'blank' => true,
|
'blank' => true,
|
||||||
'verbose' => __('creation date'),
|
'verbose' => __('creation date'),
|
||||||
|
'index' => true,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
$this->_a['idx'] = array(
|
}
|
||||||
'creation_dtime_idx' =>
|
|
||||||
array(
|
/**
|
||||||
'col' => 'creation_dtime',
|
* Get the list of file comments.
|
||||||
'type' => 'normal',
|
*
|
||||||
),
|
* 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()
|
function _toIndex()
|
||||||
@ -107,7 +120,7 @@ class IDF_Review_Patch extends Pluf_Model
|
|||||||
|
|
||||||
function preSave($create=false)
|
function preSave($create=false)
|
||||||
{
|
{
|
||||||
if ($this->id == '') {
|
if ($create) {
|
||||||
$this->creation_dtime = gmdate('Y-m-d H:i:s');
|
$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)
|
public function timelineFragment($request)
|
||||||
{
|
{
|
||||||
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function feedFragment($request)
|
public function feedFragment($request)
|
||||||
|
@ -160,11 +160,11 @@ class IDF_Views_Review
|
|||||||
$url = Pluf_HTTP_URL_urlForView('IDF_Views_Review::index',
|
$url = Pluf_HTTP_URL_urlForView('IDF_Views_Review::index',
|
||||||
array($prj->shortname));
|
array($prj->shortname));
|
||||||
// Get the list of reviewers + submitter
|
// Get the list of reviewers + submitter
|
||||||
$reviewers = $review->get_reviewers_list();
|
$reviewers = $review->getReviewers();
|
||||||
if (!Pluf_Model_InArray($review->get_submitter(), $reviewers)) {
|
if (!Pluf_Model_InArray($review->get_submitter(), $reviewers)) {
|
||||||
$reviewers[] = $review->get_submitter();
|
$reviewers[] = $review->get_submitter();
|
||||||
}
|
}
|
||||||
$comments = $patch->get_filecomments_list(array('order' => 'id DESC'));
|
$comments = $patch->getFileComments(array('order' => 'id DESC'));
|
||||||
$context = new Pluf_Template_Context(
|
$context = new Pluf_Template_Context(
|
||||||
array(
|
array(
|
||||||
'review' => $review,
|
'review' => $review,
|
||||||
@ -209,10 +209,10 @@ class IDF_Views_Review
|
|||||||
foreach ($diff->files as $filename => $def) {
|
foreach ($diff->files as $filename => $def) {
|
||||||
$fileinfo = $scm->getPathInfo($filename, $patch->get_commit()->scm_id);
|
$fileinfo = $scm->getPathInfo($filename, $patch->get_commit()->scm_id);
|
||||||
$sql = new Pluf_SQL('cfile=%s', array($filename));
|
$sql = new Pluf_SQL('cfile=%s', array($filename));
|
||||||
$cts = $patch->get_filecomments_list(array('filter'=>$sql->gen(),
|
$cts = $patch->getFileComments(array('filter'=>$sql->gen(),
|
||||||
'order'=>'creation_dtime ASC'));
|
'order'=>'creation_dtime ASC'));
|
||||||
foreach ($cts as $ct) {
|
foreach ($cts as $ct) {
|
||||||
$reviewers[] = $ct->get_submitter();
|
$reviewers[] = $ct->get_comment()->get_submitter();
|
||||||
}
|
}
|
||||||
if (count($def['chunks'])) {
|
if (count($def['chunks'])) {
|
||||||
$orig_file = ($fileinfo) ? $scm->getFile($fileinfo) : '';
|
$orig_file = ($fileinfo) ? $scm->getFile($fileinfo) : '';
|
||||||
|
@ -36,7 +36,8 @@ $m['IDF_WikiRevision'] = array('relate_to' => array('IDF_WikiPage', 'Pluf_User')
|
|||||||
$m['IDF_Review'] = array('relate_to' => array('IDF_Project', 'Pluf_User', 'IDF_Tag'),
|
$m['IDF_Review'] = array('relate_to' => array('IDF_Project', 'Pluf_User', 'IDF_Tag'),
|
||||||
'relate_to_many' => array('IDF_Tag', 'Pluf_User'));
|
'relate_to_many' => array('IDF_Tag', 'Pluf_User'));
|
||||||
$m['IDF_Review_Patch'] = array('relate_to' => array('IDF_Review', 'Pluf_User'));
|
$m['IDF_Review_Patch'] = array('relate_to' => array('IDF_Review', 'Pluf_User'));
|
||||||
$m['IDF_Review_FileComment'] = array('relate_to' => array('IDF_Review_Patch', 'Pluf_User'));
|
$m['IDF_Review_Comment'] = array('relate_to' => array('IDF_Review_Patch', 'Pluf_User'));
|
||||||
|
$m['IDF_Review_FileComment'] = array('relate_to' => array('IDF_Review_Comment', 'Pluf_User'));
|
||||||
$m['IDF_Key'] = array('relate_to' => array('Pluf_User'));
|
$m['IDF_Key'] = array('relate_to' => array('Pluf_User'));
|
||||||
$m['IDF_Conf'] = array('relate_to' => array('IDF_Project'));
|
$m['IDF_Conf'] = array('relate_to' => array('IDF_Project'));
|
||||||
$m['IDF_Commit'] = array('relate_to' => array('IDF_Project', 'Pluf_User'));
|
$m['IDF_Commit'] = array('relate_to' => array('IDF_Project', 'Pluf_User'));
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
{/foreach}
|
{/foreach}
|
||||||
{/if}{trans 'Comments (last first):'}
|
{/if}{trans 'Comments (last first):'}
|
||||||
|
|
||||||
{foreach $comments as $c}{assign $who = $c.get_submitter()}# {blocktrans}By {$who|safe}, {$c.creation_dtime|date}, on file:
|
{foreach $comments as $c}{assign $who = $c.get_comment().get_submitter()}# {blocktrans}By {$who|safe}, {$c.creation_dtime|date}, on file:
|
||||||
{$c.cfile|safe}
|
{$c.cfile|safe}
|
||||||
{/blocktrans}
|
{/blocktrans}
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ to propose more contributions</strong>.
|
|||||||
{assign $nc = $comments.count()}
|
{assign $nc = $comments.count()}
|
||||||
{assign $i = 1}
|
{assign $i = 1}
|
||||||
{foreach $comments as $c}
|
{foreach $comments as $c}
|
||||||
<div class="issue-comment{if $i == 1} issue-comment-first{/if}{if $i == $nc} issue-comment-last{/if}" id="ic{$c.id}">{assign $who = $c.get_submitter()}{aurl 'whourl', 'IDF_Views_User::view', array($who.login)}
|
<div class="issue-comment{if $i == 1} issue-comment-first{/if}{if $i == $nc} issue-comment-last{/if}" id="ic{$c.id}">{assign $who = $c.get_comment().get_submitter()}{aurl 'whourl', 'IDF_Views_User::view', array($who.login)}
|
||||||
{aurl 'url', 'IDF_Views_Review::view', array($project.shortname, $review.id)}
|
{aurl 'url', 'IDF_Views_Review::view', array($project.shortname, $review.id)}
|
||||||
{assign $id = $c.id}
|
{assign $id = $c.id}
|
||||||
{assign $url = $url~'#ic'~$c.id}
|
{assign $url = $url~'#ic'~$c.id}
|
||||||
|
Loading…
Reference in New Issue
Block a user