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

touched up the look of the issue show page

Browse Source
This commit is contained in:
hyung-hwan 2016-08-01 07:45:28 +00:00
parent 3244ff8f07
commit 2f1e378d1b
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codepot/src/codepot/controllers/issue.php
View File

@ -707,6 +707,7 @@ class Issue extends Controller
$change->priority = $this->input->post('issue_change_priority'); $change->priority = $this->input->post('issue_change_priority');
$change->comment = $this->input->post('issue_change_comment'); $change->comment = $this->input->post('issue_change_comment');
$old_state = NULL;
if ($this->issues->change ($login['id'], $project, $issueid, $change, $is_nonmember, $old_state) === FALSE) if ($this->issues->change ($login['id'], $project, $issueid, $change, $is_nonmember, $old_state) === FALSE)
{ {
$status = 'error - ' . $this->issues->getErrorMessage(); $status = 'error - ' . $this->issues->getErrorMessage();
@ -714,8 +715,7 @@ class Issue extends Controller
else else
{ {
$status = 'ok'; $status = 'ok';
if (CODEPOT_ISSUE_NOTIFICATION && $old_state != NULL && $old_state->owner != $change->owner)
if (CODEPOT_ISSUE_NOTIFICATION && $old_state->owner != $change->owner)
{ {
// TODO: message localization // TODO: message localization
$email_subject = sprintf ( $email_subject = sprintf (

2
codepot/src/codepot/models/issuemodel.php
View File

@ -307,7 +307,6 @@ class IssueModel extends Model
$old_state = $result[0]; $old_state = $result[0];
if ($change->comment == '' || $disallow_state_change) if ($change->comment == '' || $disallow_state_change)
{ {
if ($old_state->type == $change->type && if ($old_state->type == $change->type &&
$old_state->status == $change->status && $old_state->status == $change->status &&
$old_state->owner == $change->owner && $old_state->owner == $change->owner &&
@ -328,6 +327,7 @@ class IssueModel extends Model
} }
} }
} }
else $old_state = NULL;
$this->db->set ('projectid', $project->id); $this->db->set ('projectid', $project->id);
$this->db->set ('id', $id); $this->db->set ('id', $id);

19
codepot/src/codepot/views/issue_show.php
View File

@ -995,7 +995,14 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
</div> </div>
<div id='issue_show_state' class='collapsible-box'> <div id='issue_show_state' class='collapsible-box'>
<div id='issue_show_metadata_header' class='collapsible-box-header'><?php print $this->lang->line('State')?></div>
<div id='issue_show_metadata_header' class='collapsible-box-header'>
<?php
$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($issue->owner));
print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
print htmlspecialchars($issue->owner);
?>
</div>
<div id='issue_show_metadata_body' class='codepot-metadata-collapsible-body'> <div id='issue_show_metadata_body' class='codepot-metadata-collapsible-body'>
<ul id='issue_show_metadata_list' class='codepot-horizontal-list'> <ul id='issue_show_metadata_list' class='codepot-horizontal-list'>
<li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($issue->createdon); ?></li> <li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($issue->createdon); ?></li>
@ -1011,8 +1018,6 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
</ul> </ul>
<?php <?php
$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($issue->owner));
print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
if (!empty($related_code_revisions)) if (!empty($related_code_revisions))
{ {
@ -1099,8 +1104,8 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
print '<div class="codepot-issue-start-topline">'; print '<div class="codepot-issue-start-topline">';
printf ('<div class="codepot-issue-change-date">%s</div>', codepot_dbdatetodispdate($new->updatedon)); printf ('<div class="codepot-issue-change-date">%s</div>', codepot_dbdatetodispdate($new->updatedon));
print '<div class="codepot-issue-comment-updater">'; print '<div class="codepot-issue-comment-updater">';
$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby)); //$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby));
print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> "; //print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
print htmlspecialchars($new->updatedby); print htmlspecialchars($new->updatedby);
print '</div>'; print '</div>';
@ -1124,8 +1129,8 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
print '<div class="codepot-issue-change-topline">'; print '<div class="codepot-issue-change-topline">';
printf ('<div class="codepot-issue-change-date">%s</div>', codepot_dbdatetodispdate($new->updatedon)); printf ('<div class="codepot-issue-change-date">%s</div>', codepot_dbdatetodispdate($new->updatedon));
print '<div class="codepot-issue-comment-updater">'; print '<div class="codepot-issue-comment-updater">';
$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby)); //$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($new->updatedby));
print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> "; //print "<img src='{$user_icon_url}' class='codepot-committer-icon-24x24' /> ";
print htmlspecialchars($new->updatedby); print htmlspecialchars($new->updatedby);
print '</div>'; print '</div>';