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

enhanced the log view to show per-user log within a project

Browse Source
This commit is contained in:
hyung-hwan 2016-12-02 14:59:54 +00:00
parent 779b16c867
commit 163c365569
3 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
codepot/src/codepot/controllers/project.php
View File

@ -179,7 +179,7 @@ class Project extends Controller
} }
} }
function _edit_project ($project, $mode, $login) private function _edit_project ($project, $mode, $login)
{ {
$this->load->helper ('form'); $this->load->helper ('form');
$this->load->library ('form_validation'); $this->load->library ('form_validation');
@ -327,7 +327,7 @@ class Project extends Controller
} }
} }
function _delete_project ($project, $login) private function _delete_project ($project, $login)
{ {
$this->load->helper ('form'); $this->load->helper ('form');
$this->load->library ('form_validation'); $this->load->library ('form_validation');
@ -426,11 +426,19 @@ class Project extends Controller
} }
} }
function log ($projectid = '', $offset = 0) function log ($projectid = '', $userid = '!', $offset = 0)
{ {
$this->load->model ('ProjectModel', 'projects'); $this->load->model ('ProjectModel', 'projects');
$login = $this->login->getUser (); $login = $this->login->getUser ();
if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
{
redirect ('main/signin');
return;
}
if ($userid == '') $userid = $login['id'];
else $userid = $this->converter->HexToAscii ($userid);
$project = $this->projects->get ($projectid); $project = $this->projects->get ($projectid);
if ($project === FALSE) if ($project === FALSE)
@ -451,8 +459,8 @@ class Project extends Controller
{ {
$this->load->library ('pagination'); $this->load->library ('pagination');
$this->load->model ('LogModel', 'logs'); $this->load->model ('LogModel', 'logs');
$num_log_entries = $this->logs->getNumEntries ($projectid); $num_log_entries = $this->logs->getNumEntries ($projectid, $userid);
if ($num_log_entries === FALSE) if ($num_log_entries === FALSE)
{ {
$data['login'] = $login; $data['login'] = $login;
@ -462,14 +470,15 @@ class Project extends Controller
return; return;
} }
$pagecfg['base_url'] = site_url() . "/project/log/{$projectid}/"; $xuserid = $this->converter->AsciiToHex($userid);
$pagecfg['base_url'] = site_url() . "/project/log/{$projectid}/{$xuserid}/";
$pagecfg['total_rows'] = $num_log_entries; $pagecfg['total_rows'] = $num_log_entries;
$pagecfg['per_page'] = CODEPOT_MAX_LOGS_PER_PAGE; $pagecfg['per_page'] = CODEPOT_MAX_LOGS_PER_PAGE;
$pagecfg['uri_segment'] = 4; $pagecfg['uri_segment'] = 5;
$pagecfg['first_link'] = $this->lang->line('First'); $pagecfg['first_link'] = $this->lang->line('First');
$pagecfg['last_link'] = $this->lang->line('Last'); $pagecfg['last_link'] = $this->lang->line('Last');
$log_entries = $this->logs->getEntries ($offset, $pagecfg['per_page'], $projectid); $log_entries = $this->logs->getEntries ($offset, $pagecfg['per_page'], $projectid, $userid);
if ($log_entries === FALSE) if ($log_entries === FALSE)
{ {
$data['login'] = $login; $data['login'] = $login;
@ -493,7 +502,7 @@ class Project extends Controller
function enjson_catalog ($filter = '', $offset = '') function enjson_catalog ($filter = '', $offset = '')
{ {
$this->load->model ('ProjectModel', 'projects'); $this->load->model ('ProjectModel', 'projects');
$login = $this->login->getUser (); $login = $this->login->getUser ();
if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '') if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
{ {

43
codepot/src/codepot/views/log.php
View File

@ -217,22 +217,40 @@ $this->load->view (
if ($log['action'] == 'revpropchange') if ($log['action'] == 'revpropchange')
{ {
$fmt = $this->lang->line ('MSG_LOG_REVPROP_CHANGE_BY'); $fmt = $this->lang->line ('MSG_LOG_REVPROP_CHANGE_BY');
//print htmlspecialchars (sprintf($fmt, $code['propname'], $code['author']));
printf ( if ($pagetype == 'project')
htmlspecialchars ($fmt), {
htmlspecialchars ($code['propname']), printf (
anchor ("/user/log/{$xauthor}", htmlspecialchars ($code['author']))); htmlspecialchars ($fmt),
//$code['action'] htmlspecialchars ($code['propname']),
anchor ("/project/log/{$log['projectid']}/{$xauthor}", htmlspecialchars ($code['author'])));
}
else
{
printf (
htmlspecialchars ($fmt),
htmlspecialchars ($code['propname']),
anchor ("/user/log/{$xauthor}", htmlspecialchars ($code['author'])));
}
} }
else else
{ {
$fmt = $this->lang->line ( $fmt = $this->lang->line (
'MSG_LOG_'.strtoupper($log['action']).'_BY'); 'MSG_LOG_'.strtoupper($log['action']).'_BY');
//print htmlspecialchars (sprintf($fmt, $code['author'])); if ($pagetype == 'project')
printf ( {
htmlspecialchars ($fmt), printf (
anchor ("/user/log/{$xauthor}", htmlspecialchars ($code['author']))); htmlspecialchars ($fmt),
anchor ("/project/log/{$log['projectid']}/{$xauthor}", htmlspecialchars ($code['author'])));
}
else
{
printf (
htmlspecialchars ($fmt),
anchor ("/user/log/{$xauthor}", htmlspecialchars ($code['author'])));
}
} }
print '</span>'; print '</span>';
@ -288,7 +306,10 @@ $this->load->view (
'MSG_LOG_'.strtoupper($log['action']).'_BY'); 'MSG_LOG_'.strtoupper($log['action']).'_BY');
$xuserid = $this->converter->AsciiToHex($log['userid']); $xuserid = $this->converter->AsciiToHex($log['userid']);
printf ($fmt, anchor ("/user/log/{$xuserid}", htmlspecialchars($log['userid']))); if ($pagetype == 'project')
printf ($fmt, anchor ("/project/log/{$log['projectid']}/{$xuserid}", htmlspecialchars($log['userid'])));
else
printf ($fmt, anchor ("/user/log/{$xuserid}", htmlspecialchars($log['userid'])));
print '</span>'; print '</span>';
} }

2
codepot/src/codepot/views/project_home.php
View File

@ -66,7 +66,7 @@ function render_wiki()
}); });
$("#project_home_sidebar_log_all_button").button ().click (function () { $("#project_home_sidebar_log_all_button").button ().click (function () {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", "/project/log/" + "<?php print $project->id; ?>")); $(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", "/project/log/" + "<?php print $project->id; ?>" + "/" + "<?php print $this->converter->AsciiToHex(''); ?>" + "/"));
return false; return false;
}); });
} }