Skip to content
Permalink
Browse files

removing the double inclusion of the calendar processing

  • Loading branch information
caseysoftware committed Oct 11, 2014
1 parent c715b09 commit 805ec10944e804b60cdec91dbe33de9004423fdb
@@ -17,7 +17,6 @@
}

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

// get the passed timestamp (today if none)
$date = w2PgetParam($_GET, 'date', null);
@@ -35,8 +35,6 @@
$AppUI->redirect(ACCESS_DENIED);
}

$AppUI->getTheme()->loadCalendarJS();

$today = new w2p_Utilities_Date();
$today->addDays(1);
$today->setHour($w2Pconfig['cal_day_start']);
@@ -32,7 +32,6 @@
}

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$pstatus = w2PgetSysVal('ProjectStatus');
$ptype = w2PgetSysVal('ProjectType');
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $company_id, $dept_ids, $department, $min_view, $m, $a, $user_id, $tab, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$min_view = defVal($min_view, false);
$project_id = w2PgetParam($_GET, 'project_id', 0);
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$coarseness = w2PgetParam($_POST, 'coarseness', 1);
$do_report = w2PgetParam($_POST, 'do_report', 0);
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$company_id = (int) w2PgetParam($_POST, 'company_id', 0);
$active_projects = w2PgetParam($_POST, 'active_projects', 0);
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$company_id = (int) w2PgetParam($_POST, 'company_id', 0);
$active_projects = w2PgetParam($_POST, 'active_projects', 0);
@@ -5,8 +5,7 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();
//TODO: block execution unless I tell it to

/**
* Generates a report of the task logs for given dates
*/
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

/**
* Generates a report of the task logs for given dates
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$do_report = w2PgetParam($_POST, 'do_report', 0);
$log_start_date = w2PgetParam($_POST, 'log_start_date', 0);
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

/**
* Generates a report of the task logs for given dates
@@ -8,7 +8,6 @@
* Generates a report of the task logs for given dates
*/
global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$perms = &$AppUI->acl();
if (!canView('task_log')) {
@@ -8,7 +8,6 @@
* Generates a report of the task logs for given dates
*/
global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$perms = &$AppUI->acl();
if (!canView('task_log')) {
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$do_report = w2PgetParam($_POST, 'do_report', 0);
$log_start_date = w2PgetParam($_POST, 'log_start_date', 0);
@@ -5,7 +5,6 @@
// @todo convert to template

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$do_report = w2PgetParam($_POST, 'do_report', 0);
$log_start_date = w2PgetParam($_POST, 'log_start_date', 0);
@@ -3,7 +3,6 @@
die('You should not access this file directly.');
}
global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$budget_id = (int) w2PgetParam($_GET, 'budget_id', 0);

@@ -3,7 +3,6 @@
die('You should not access this file directly.');
}
global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$budget_id = (int) w2PgetParam($_GET, 'budget_id', 0);

@@ -8,7 +8,6 @@
global $can_edit_time_information, $locale_char_set, $object;
global $durnTypes, $task_project, $object_id, $tab;
global $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

//Time arrays for selects
$start = (int) w2PgetConfig('cal_day_start', 8);
@@ -6,7 +6,6 @@
// @todo remove database query

global $AppUI, $cal_sdf;
$AppUI->getTheme()->loadCalendarJS();

$do_report = w2PgetParam($_POST, 'do_report', true);
$log_start_date = w2PgetParam($_POST, 'log_start_date', 0);
@@ -6,7 +6,6 @@

global $AppUI, $min_view, $m, $a, $user_id, $tab, $tasks, $cal_sdf;
global $gantt_map, $currentGanttImgSource, $filter_task_list, $caller;
$AppUI->getTheme()->loadCalendarJS();

$min_view = defVal($min_view, false);

@@ -26,8 +26,6 @@
$AppUI->redirect(ACCESS_DENIED);
}

$AppUI->getTheme()->loadCalendarJS();

// check permissions
$perms = &$AppUI->acl();
$canEditTask = $perms->checkModuleItem('tasks', 'edit', $obj->task_id);
@@ -15,7 +15,6 @@
$a = ($user_id) ? '&a=view&user_id=' . $user_id : '';
$a .= '&tab=' . $currentTabId . '&showdetails=1';

$AppUI->getTheme()->loadCalendarJS();
?>
<script language="javascript" type="text/javascript">
function checkDate()

0 comments on commit 805ec10

Please sign in to comment.
You can’t perform that action at this time.