rename variables for consistency
This commit is contained in:
parent
199c4e4960
commit
f57ce0c9a6
8 changed files with 103 additions and 103 deletions
|
|
@ -120,7 +120,7 @@ sub getDaysInWeek {
|
|||
my $week = $_[0];
|
||||
return [] unless $week;
|
||||
|
||||
my ($session,$dt,$eh) = $self->getSessionVars("datetime","log");
|
||||
my ($session,$dt,$log) = $self->getSessionVars("datetime","log");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
#Week View Below
|
||||
|
|
@ -169,7 +169,7 @@ sub view {
|
|||
my $self = shift;
|
||||
my $var = $self->get;
|
||||
|
||||
my ($session,$privilege,$form,$db,$dt,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","datetime","user","log","config");
|
||||
my ($session,$privilege,$form,$db,$dt,$user,$log,$config) = $self->getSessionVars("privilege","form","db","datetime","user","log","config");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
$var->{'extras'} = $session->url->make_urlmap_work($config->get("extrasURL"))."/wobject/TimeTracking";
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ sub view {
|
|||
|
||||
sub www_editTimeEntrySave {
|
||||
my $self = shift;
|
||||
my ($session,$privilege,$form,$db,$user,$eh,$dt) = $self->getSessionVars("privilege","form","db","user","log","datetime");
|
||||
my ($session,$privilege,$form,$db,$user,$log,$dt) = $self->getSessionVars("privilege","form","db","user","log","datetime");
|
||||
|
||||
return $privilege->insufficient unless ($self->canView);
|
||||
|
||||
|
|
@ -289,7 +289,7 @@ sub www_editTimeEntrySave {
|
|||
|
||||
sub www_deleteProject {
|
||||
my $self = shift;
|
||||
my ($session,$privilege,$form,$db,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","user","log","config");
|
||||
my ($session,$privilege,$form,$db,$user,$log,$config) = $self->getSessionVars("privilege","form","db","user","log","config");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
#Check Privileges
|
||||
|
|
@ -316,7 +316,7 @@ sub www_deleteProject {
|
|||
|
||||
sub www_editProject {
|
||||
my $self = shift;
|
||||
my ($session,$privilege,$form,$db,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","user","log","config");
|
||||
my ($session,$privilege,$form,$db,$user,$log,$config) = $self->getSessionVars("privilege","form","db","user","log","config");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
#Check Privileges
|
||||
|
|
@ -421,7 +421,7 @@ sub www_editProject {
|
|||
|
||||
sub www_editProjectSave {
|
||||
my $self = shift;
|
||||
my ($session,$privilege,$form,$db,$dt,$user,$eh) = $self->getSessionVars("privilege","form","db","datetime","user","log");
|
||||
my ($session,$privilege,$form,$db,$dt,$user,$log) = $self->getSessionVars("privilege","form","db","datetime","user","log");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
#Check Privileges
|
||||
|
|
@ -486,7 +486,7 @@ sub www_editProjectSave {
|
|||
|
||||
sub www_manageProjects {
|
||||
my $self = shift;
|
||||
my ($session,$privilege,$form,$db,$dt,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","datetime","user","log","config");
|
||||
my ($session,$privilege,$form,$db,$dt,$user,$log,$config) = $self->getSessionVars("privilege","form","db","datetime","user","log","config");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
#Check Privileges
|
||||
|
|
@ -615,7 +615,7 @@ sub www_buildTimeTable {
|
|||
my $viewVar = $_[0];
|
||||
my $var = {};
|
||||
$var->{'extras'} = $viewVar->{'extras'};
|
||||
my ($session,$dt,$eh,$form,$db,$user,$privilege) = $self->getSessionVars("datetime","log","form","db","user","privilege");
|
||||
my ($session,$dt,$log,$form,$db,$user,$privilege) = $self->getSessionVars("datetime","log","form","db","user","privilege");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
return $privilege->insufficient unless ($self->canView);
|
||||
|
|
@ -715,7 +715,7 @@ sub www_buildTimeTable {
|
|||
#Build Report Info
|
||||
my $report = $db->quickHashRef("select * from TT_report where resourceId=? and assetId=? and startDate=? and endDate=?",[$resourceId,$self->getId,$weekStart,$weekEnd]);
|
||||
my $reportId = $report->{reportId};
|
||||
#$eh->warn($reportId);
|
||||
#$log->warn($reportId);
|
||||
#Add Report Stuff to form header
|
||||
$viewVar->{'form.header'} .= WebGUI::Form::hidden($session, {
|
||||
-name=>"reportId",
|
||||
|
|
@ -785,7 +785,7 @@ sub www_buildTimeTable {
|
|||
|
||||
sub _buildRow {
|
||||
my $self = shift;
|
||||
my ($session,$dt,$eh,$form,$db,$user) = $self->getSessionVars("datetime","log","form","db","user");
|
||||
my ($session,$dt,$log,$form,$db,$user) = $self->getSessionVars("datetime","log","form","db","user");
|
||||
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
|
||||
|
||||
my $entry = $_[0] || {};
|
||||
|
|
@ -825,7 +825,7 @@ sub _buildRow {
|
|||
else {
|
||||
%taskHash = %{$taskList->{$projectId}};
|
||||
}
|
||||
#$eh->warn($projectId);
|
||||
#$log->warn($projectId);
|
||||
}
|
||||
my $chooseLabel = $i18n->get("Choose One");
|
||||
%taskHash = (""=>$chooseLabel,%taskHash);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue