hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finished primitive code review editing

Browse Source
This commit is contained in:
hyung-hwan 2015-02-06 14:03:12 +00:00
parent 98695a00b5
commit 2297420797
3 changed files with 112 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
codepot/src/codepot/controllers/code.php
View File

@ -314,34 +314,76 @@ class Code extends Controller
} }
} }
if ($login['id'] != '' && $this->input->post('edit_review_comment')) if ($login['id'] != '')
{ {
// Note that edit_log_message and edit_review_comment are not if ($this->input->post('new_review_comment'))
// supposed to be/ POSTed at the same time.
// this program may break if that happens.
$this->load->helper ('form');
$this->load->library ('form_validation');
$this->form_validation->set_rules ('edit_review_comment', $this->lang->line('Comment'), 'required|min_length[10]');
$this->form_validation->set_error_delimiters('<span class="form_field_error">','</span>');
if ($this->form_validation->run())
{ {
$review_comment = $this->input->post('edit_review_comment'); // Note that edit_log_message and new_review_comment are not
if ($this->code_review->insertReview ($projectid, $rev, $login['id'], $review_comment) === FALSE) // supposed to be/ POSTed at the same time.
// this program may break if that happens.
$this->load->helper ('form');
$this->load->library ('form_validation');
$this->form_validation->set_rules ('new_review_comment', $this->lang->line('Comment'), 'required|min_length[10]');
$this->form_validation->set_error_delimiters('<span class="form_field_error">','</span>');
if ($this->form_validation->run())
{ {
$data['popup_error_message'] = 'Cannot add code review'; $review_comment = $this->input->post('new_review_comment');
if ($this->code_review->insertReview ($projectid, $rev, $login['id'], $review_comment) === FALSE)
{
$data['popup_error_message'] = 'Cannot add code review comment';
}
else
{
// this is a hack to clear form data upon success
$this->form_validation->_field_data = array();
}
} }
else else
{ {
// this is a hack to clear form data upon success $data['popup_error_message'] = 'Invalid review comment';
$this->form_validation->_field_data = array();
} }
} }
else else if ($this->input->post('edit_review_comment_no'))
{ {
$data['popup_error_message'] = 'Invalid review comment'; $this->load->helper ('form');
$this->load->library ('form_validation');
// get the comment number without validation.
$comment_no = $this->input->post('edit_review_comment_no');
if (is_numeric($comment_no))
{
$comment_field_name = "edit_review_comment_{$comment_no}";
$this->form_validation->set_rules ($comment_field_name, $this->lang->line('Comment'), 'required|min_length[10]');
$this->form_validation->set_error_delimiters('<span class="form_field_error">','</span>');
if ($this->form_validation->run())
{
//
// TODO: should let sysadmin? to change comments???
//
$review_comment = $this->input->post($comment_field_name);
if ($this->code_review->updateReview ($projectid, $rev, (integer)$comment_no, $login['id'], $review_comment, TRUE) === FALSE)
{
$data['popup_error_message'] = 'Cannot edit code review comment';
}
else
{
// this is a hack to clear form data upon success
$this->form_validation->_field_data = array();
}
}
else
{
$data['popup_error_message'] = 'Invalid review comment';
}
}
else
{
$data['popup_error_message'] = 'Invalid review comment number';
}
} }
} }

35
codepot/src/codepot/models/codereviewmodel.php
View File

@ -15,7 +15,6 @@ class CodeReviewModel extends Model
$this->db->where ('projectid', (string)$projectid); $this->db->where ('projectid', (string)$projectid);
$this->db->where ('rev', $revision); $this->db->where ('rev', $revision);
$query = $this->db->get ('code_review'); $query = $this->db->get ('code_review');
//if ($query === FALSE)
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
{ {
$this->db->trans_complete (); $this->db->trans_complete ();
@ -65,14 +64,40 @@ class CodeReviewModel extends Model
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
$this->db->set ('userid', $userid); $this->db->set ('userid', $userid);
$this->db->set ('message', "$rev,$sno"); $this->db->set ('message', "$rev,$sno");
$this->db->insert ('log');*/ $this->db->insert ('log');*/
$this->db->trans_complete (); $this->db->trans_complete ();
if ($this->db->trans_status() === FALSE) return FALSE; if ($this->db->trans_status() === FALSE) return FALSE;
return $newsno; return $newsno;
} }
function updateReview ($projectid, $revision, $sno, $userid, $comment, $strict = FALSE)
{
// TODO: check if userid can do this..
$this->db->trans_start ();
$this->db->where ('projectid', $projectid);
$this->db->where ('rev', $revision);
$this->db->where ('sno', $sno);
if ($strict) $this->db->where ('updatedby', $userid);
$this->db->set ('comment', $comment);
$this->db->set ('updatedon', date('Y-m-d H:i:s'));
$this->db->set ('updatedby', $userid);
$this->db->update ('code_review');
/*$this->db->set ('createdon', date('Y-m-d H:i:s'));
$this->db->set ('type', 'code_review');
$this->db->set ('action', 'insert');
$this->db->set ('projectid', $projectid);
$this->db->set ('userid', $userid);
$this->db->set ('message', "$rev,$sno");
$this->db->insert ('log');*/
$this->db->trans_complete ();
return $this->db->trans_status();
}
function deleteReview ($projectid, $revision, $sno, $userid) function deleteReview ($projectid, $revision, $sno, $userid)
{ {
// TODO: check if userid can do this.. // TODO: check if userid can do this..
@ -89,10 +114,10 @@ class CodeReviewModel extends Model
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
$this->db->set ('userid', $userid); $this->db->set ('userid', $userid);
$this->db->set ('message', "$rev,$sno"); $this->db->set ('message', "$rev,$sno");
$this->db->insert ('log');*/ $this->db->insert ('log');*/
$this->db->trans_complete (); $this->db->trans_complete ();
return $this->db->trans_status(); return $this->db->trans_status();
} }
} }

45
codepot/src/codepot/views/code_revision.php
View File

@ -81,14 +81,12 @@ $(function() {
); );
<?php <?php
for ($i = $review_count; $i > 0; ) for ($i = $review_count; $i > 0; $i--)
{ {
$i--; $rc = $reviews[$i - 1];
$rc = $reviews[$i];
if ($login['id'] == $rc->updatedby) if ($login['id'] == $rc->updatedby)
{ {
$edit_title = $this->lang->line('Comment') . ' ' . ($i + 1); $edit_title = $this->lang->line('Comment') . " {$i}";
$label_ok = $this->lang->line('OK'); $label_ok = $this->lang->line('OK');
$label_cancel = $this->lang->line('Cancel'); $label_cancel = $this->lang->line('Cancel');
print (" print ("
@ -164,8 +162,8 @@ function render_wiki()
?> ?>
creole_render_wiki ( creole_render_wiki (
"code_revision_mainarea_review_comment_text_" + i , "code_revision_mainarea_review_comment_text_" + (i + 1) ,
"code_revision_mainarea_review_comment_" + i, "code_revision_mainarea_review_comment_" + (i + 1),
"<?=site_url()?>/wiki/show/<?=$project->id?>/", "<?=site_url()?>/wiki/show/<?=$project->id?>/",
"" ""
); );
@ -356,12 +354,10 @@ $history = $file['history'];
<div id="code_revision_mainarea_review_comment"> <div id="code_revision_mainarea_review_comment">
<?php <?php
for ($i = $review_count; $i > 0; ) for ($i = $review_count; $i > 0; $i--)
{ {
$i--; $rc = $reviews[$i - 1];
print "<div id='code_revision_mainarea_review_comment_title_{$i}' class='review_comment_title'>\n";
$rc = $reviews[$i];
print "<div id='code_revision_mainarea_review_comment_title_$i' class='review_comment_title'>\n";
printf (" <span class='review_comment_title_no'>%d</span>", $rc->sno); printf (" <span class='review_comment_title_no'>%d</span>", $rc->sno);
printf (" <span class='review_comment_title_updatedby'>%s</span>", $rc->updatedby); printf (" <span class='review_comment_title_updatedby'>%s</span>", $rc->updatedby);
printf (" <span class='review_comment_title_updatedon'>%s</span>", $rc->updatedon); printf (" <span class='review_comment_title_updatedon'>%s</span>", $rc->updatedon);
@ -377,8 +373,8 @@ $history = $file['history'];
print ("</div>\n"); print ("</div>\n");
print "<div id='code_revision_mainarea_review_comment_$i' class='review_comment_text'>\n"; print "<div id='code_revision_mainarea_review_comment_{$i}' class='review_comment_text'>\n";
print "<pre id='code_revision_mainarea_review_comment_text_$i' style='visibility: hidden'>\n"; print "<pre id='code_revision_mainarea_review_comment_text_{$i}' style='visibility: hidden'>\n";
print $rc->comment; print $rc->comment;
@ -425,29 +421,30 @@ $history = $file['history'];
<?php <?php
print form_open("code/revision/{$project->id}${revreqroot}", 'id="code_revision_new_review_comment_form"'); print form_open("code/revision/{$project->id}${revreqroot}", 'id="code_revision_new_review_comment_form"');
print form_error('edit_review_comment'); print form_error('new_review_comment');
print '<br />';
print form_textarea ( print form_textarea (
array ('name' => 'edit_review_comment', array ('name' => 'new_review_comment',
'value' => set_value('edit_review_comment', ''), 'value' => set_value('new_review_comment', ''),
'rows'=> 25, 'cols' => 100, 'rows'=> 20, 'cols' => 90,
'id' => 'code_revision_edit_review_comment') 'id' => 'code_revision_new_review_comment')
); );
print form_close(); print form_close();
for ($i = $review_count; $i > 0; ) for ($i = $review_count; $i > 0; $i--)
{ {
$i--; $rc = $reviews[$i - 1];
$rc = $reviews[$i];
if ($login['id'] == $rc->updatedby) if ($login['id'] == $rc->updatedby)
{ {
print "<div id='code_revision_edit_review_comment_div_{$i}'>\n"; print "<div id='code_revision_edit_review_comment_div_{$i}'>\n";
print form_open("code/revision/{$project->id}${revreqroot}", "id='code_revision_edit_review_comment_form_{$i}'"); print form_open("code/revision/{$project->id}${revreqroot}", "id='code_revision_edit_review_comment_form_{$i}'");
print form_error("edit_review_comment_{$i}");
print '<br />';
print form_textarea ( print form_textarea (
array ('name' => "edit_review_comment_{$i}", array ('name' => "edit_review_comment_{$i}",
'value' => $rc->comment, 'rows'=> 10, 'cols' => 70, 'value' => $rc->comment, 'rows'=> 20, 'cols' => 90,
'id' => "code_revision_edit_review_comment_{$i}") 'id' => "code_revision_edit_review_comment_{$i}")
); );
print form_close(); print form_close();