Netsyms
/
Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed the "create ticket on" options

Browse Source 
It may cause some weird issues when creating a ticket (who created it, message, custom fields, etc), so pulling this out for now. There will be a way to create a ticket from an already created event via a query string that is passed to the admin_new_ticket page.
merge-requests/1/head
Mike Koch 8 years ago
parent 0fecd860e2
commit 1c58747db7
5 changed files with 7 additions and 201 deletions
Show Stats Download Patch File Download Diff File

140
admin/calendar.php
Unescape Escape View File

@ -163,76 +163,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label for="create-ticket-date" class="col-sm-6 control-label">
Create Ticket Date
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="tooltip"
title="Date to create a ticket for this event. Leave empty to not create a ticket.
Set this value to today to create a ticket immediately."></i>
</label>
<div class="col-sm-6">
<input type="text" name="create-ticket-date" class="form-control datepicker" placeholder="Create Ticket Date">
</div>
</div>
</div>
<div class="col-md-6">
<?php
if (hesk_checkPermission('can_assign_others',0)) {
$admins = array();
$result = hesk_dbQuery("SELECT `id`,`name`,`isadmin`,`categories`,`heskprivileges` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' ORDER BY `name` ASC");
while ($row = hesk_dbFetchAssoc($result)) {
/* Is this an administrator? */
if ($row['isadmin']) {
$admins[$row['id']] = $row['name'];
continue;
}
/* Not admin, is user allowed to view tickets? */
if (strpos($row['heskprivileges'], 'can_view_tickets') !== false) {
$admins[$row['id']] = $row['name'];
continue;
}
}
?>
<div class="form-group">
<label for="assign-to" class="col-sm-6 control-label">
Assign To
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="tooltip"
title="User to assign the ticket to when it is created."></i>
</label>
<div class="col-sm-6">
<select name="assign-to" class="form-control">
<?php
if ($hesk_settings['autoassign']) {
echo '<option value="-2"> &gt; ' . $hesklang['aass'] . ' &lt; </option>';
}
$owner = isset($_SESSION['as_owner']) ? intval($_SESSION['as_owner']) : 0;
foreach ($admins as $k=>$v) {
if ($k == $owner) {
echo '<option value="'.$k.'" selected>'.$v.'</option>';
} else {
echo '<option value="'.$k.'">'.$v.'</option>';
}
}
?>
</select>
</div>
</div>
<?php } elseif (hesk_checkPermission('can_assign_self',0)) { ?>
<div class="form-group">
<div class="col-sm-6 col-sm-offset-3">
<label><input type="checkbox" name="assign-to" value="<?php echo $_SESSION['id']; ?>"> Assign to myself</label>
</div>
</div>
<?php } ?>
</div>
</div>
</div>
<div class="modal-footer">
<input type="hidden" name="action" value="create">
@ -347,76 +277,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label for="create-ticket-date" class="col-sm-6 control-label">
Create Ticket Date
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="tooltip"
title="Date to create a ticket for this event. Leave empty to not create a ticket.
Set this value to today to create a ticket immediately."></i>
</label>
<div class="col-sm-6">
<input type="text" name="create-ticket-date" class="form-control datepicker" placeholder="Create Ticket Date">
</div>
</div>
</div>
<div class="col-md-6">
<?php
if (hesk_checkPermission('can_assign_others',0)) {
$admins = array();
$result = hesk_dbQuery("SELECT `id`,`name`,`isadmin`,`categories`,`heskprivileges` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' ORDER BY `name` ASC");
while ($row = hesk_dbFetchAssoc($result)) {
/* Is this an administrator? */
if ($row['isadmin']) {
$admins[$row['id']] = $row['name'];
continue;
}
/* Not admin, is user allowed to view tickets? */
if (strpos($row['heskprivileges'], 'can_view_tickets') !== false) {
$admins[$row['id']] = $row['name'];
continue;
}
}
?>
<div class="form-group">
<label for="assign-to" class="col-sm-6 control-label">
Assign To
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="tooltip"
title="User to assign the ticket to when it is created."></i>
</label>
<div class="col-sm-6">
<select name="assign-to" class="form-control">
<?php
if ($hesk_settings['autoassign']) {
echo '<option value="-2"> &gt; ' . $hesklang['aass'] . ' &lt; </option>';
}
$owner = isset($_SESSION['as_owner']) ? intval($_SESSION['as_owner']) : 0;
foreach ($admins as $k=>$v) {
if ($k == $owner) {
echo '<option value="'.$k.'" selected>'.$v.'</option>';
} else {
echo '<option value="'.$k.'">'.$v.'</option>';
}
}
?>
</select>
</div>
</div>
<?php } elseif (hesk_checkPermission('can_assign_self',0)) { ?>
<div class="form-group">
<div class="col-sm-6 col-sm-offset-3">
<label><input type="checkbox" name="assign-to" value="<?php echo $_SESSION['id']; ?>"> Assign to myself</label>
</div>
</div>
<?php } ?>
</div>
</div>
</div>
<div class="modal-footer">
<input type="hidden" name="id">

4
install/mods-for-hesk/sql/installSql.php
Unescape Escape View File

@ -727,9 +727,7 @@ function execute260Scripts()
`all_day` ENUM('0','1') NOT NULL,
`name` VARCHAR(255) NOT NULL,
`location` VARCHAR(255),
`comments` MEDIUMTEXT,
`create_ticket_date` DATETIME,
`create_ticket_assign_to` INT) ENGINE = MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
`comments` MEDIUMTEXT) ENGINE = MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` ADD COLUMN `due_date` DATETIME");
executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` SET `Value` = '2.6.0' WHERE `Key` = 'modsForHeskVersion'");
}

4
internal-api/admin/calendar/index.php
Unescape Escape View File

@ -32,8 +32,6 @@ if ($request_method === 'GET') {
$event['end'] = hesk_POST('endTime');
$event['all_day'] = hesk_POST('allDay') === 'true';
$event['comments'] = hesk_POST('comments');
$event['create_ticket_date'] = hesk_POST('createTicketDate');
$event['assign_to'] = hesk_POST('assignTo');
$id = create_event($event, $hesk_settings);
@ -49,8 +47,6 @@ if ($request_method === 'GET') {
$event['end'] = hesk_POST('endTime');
$event['all_day'] = hesk_POST('allDay') === 'true';
$event['comments'] = hesk_POST('comments');
$event['create_ticket_date'] = hesk_POST('createTicketDate');
$event['assign_to'] = hesk_POST('assignTo');
update_event($event, $hesk_settings);

14
internal-api/dao/calendar_dao.php
Unescape Escape View File

@ -17,8 +17,6 @@ function get_events($start, $end, $hesk_settings) {
$event['title'] = $row['name'];
$event['location'] = $row['location'];
$event['comments'] = $row['comments'];
$event['createTicketDate'] = $row['create_ticket_date'] != null ? $row['create_ticket_date'] : null;
$event['assignTo'] = $row['create_ticket_assign_to'] != null ? intval($row['create_ticket_assign_to']) : null;
$events[] = $event;
}
@ -44,17 +42,12 @@ function create_event($event, $hesk_settings) {
$event['start'] = date('Y-m-d H:i:s', strtotime($event['start']));
$event['end'] = date('Y-m-d H:i:s', strtotime($event['end']));
if ($event['create_ticket_date'] != null) {
$event['create_ticket_date'] = date('Y-m-d H:i:s', strtotime($event['create_ticket_date']));
}
$event['all_day'] = $event['all_day'] ? 1 : 0;
$event['assign_to'] = $event['assign_to'] != null ? intval($event['assign_to']) : 'NULL';
$sql = "INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` (`start`, `end`, `all_day`,
`name`, `location`, `comments`, `create_ticket_date`, `create_ticket_assign_to`) VALUES (
`name`, `location`, `comments`) VALUES (
'" . hesk_dbEscape($event['start']) . "', '" . hesk_dbEscape($event['end']) . "', '" . hesk_dbEscape($event['all_day']) . "',
'" . hesk_dbEscape($event['title']) . "', '" . hesk_dbEscape($event['location']) . "', '" . hesk_dbEscape($event['comments']) . "',
'" . hesk_dbEscape($event['create_ticket_date']) . "', " . $event['assign_to'] . ")";
'" . hesk_dbEscape($event['title']) . "', '" . hesk_dbEscape($event['location']) . "', '" . hesk_dbEscape($event['comments']) . "')";
hesk_dbQuery($sql);
return hesk_dbInsertID();
@ -72,8 +65,7 @@ function update_event($event, $hesk_settings) {
$sql = "UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` SET `start` = '" . hesk_dbEscape($event['start'])
. "', `end` = '" . hesk_dbEscape($event['end']) . "', `all_day` = '" . hesk_dbEscape($event['all_day']) . "', `name` = '"
. hesk_dbEscape($event['title']) . "', `location` = '" . hesk_dbEscape($event['location']) . "', `comments` = '"
. hesk_dbEscape($event['comments']) . "', `create_ticket_date` = '" . hesk_dbEscape($event['create_ticket_date'])
. "', `create_ticket_assign_to` = " . $event['assign_to'] . " WHERE `id` = " . intval($event['id']);
. hesk_dbEscape($event['comments']) . "' WHERE `id` = " . intval($event['id']);
hesk_dbQuery($sql);
}

46
js/calendar/mods-for-hesk-calendar.js
Unescape Escape View File

@ -67,10 +67,6 @@ $(document).ready(function() {
start += ' ' + event.start.format('HH:mm:ss');
end += ' ' + event.end.format('HH:mm:ss');
}
var createTicketDate = event.createTicketDate;
if (createTicketDate != null) {
createTicketDate = createTicketDate.format('YYYY-MM-DD');
}
var data = {
id: event.id,
title: event.title,
@ -79,8 +75,6 @@ $(document).ready(function() {
endTime: end,
allDay: event.allDay,
comments: event.comments,
createTicketDate: createTicketDate,
assignTo: event.assignTo,
action: 'update'
};
$.ajax({
@ -141,17 +135,7 @@ $(document).ready(function() {
var end = $('#create-form input[name="end-date"]').val();
var dateFormat = 'YYYY-MM-DD';
var allDay = $('#create-form input[name="all-day"]').is(':checked');
var createTicketDate = null;
var assignTo = null;
if ($('#create-form input[name="assign-to"]').length) {
assignTo = $('#create-form input[name="assign-to"]').val();
} else if ($('#create-form select[name="assign-to"]').length) {
assignTo = $('#create-form select[name="assign-to"]').val();
}
if ($('#create-form input[name="create-ticket-date"]').val() != '') {
createTicketDate = moment($('#create-form input[name="create-ticket-date"]').val()).format('YYYY-MM-DD');
}
if (!allDay) {
start += ' ' + $('#create-form input[name="start-time"]').val();
end += ' ' + $('#create-form input[name="end-time"]').val();
@ -165,9 +149,8 @@ $(document).ready(function() {
endTime: moment(end).format(dateFormat),
allDay: allDay,
comments: $('#create-form textarea[name="comments"]').val(),
createTicketDate: createTicketDate,
assignTo: assignTo,
action: 'create'
action: 'create',
type: 'CALENDAR'
};
$.ajax({
@ -192,17 +175,7 @@ $(document).ready(function() {
var end = $form.find('input[name="end-date"]').val();
var dateFormat = 'YYYY-MM-DD';
var allDay = $form.find('input[name="all-day"]').is(':checked');
var createTicketDate = null;
var assignTo = null;
if ($form.find('input[name="assign-to"]').length) {
assignTo = $form.find('input[name="assign-to"]').val();
} else if ($form.find('select[name="assign-to"]').length) {
assignTo = $form.find('select[name="assign-to"]').val();
}
if ($form.find('input[name="create-ticket-date"]').val() != '') {
createTicketDate = moment($form.find('input[name="create-ticket-date"]').val()).format('YYYY-MM-DD');
}
if (!allDay) {
start += ' ' + $form.find('input[name="start-time"]').val();
end += ' ' + $form.find('input[name="end-time"]').val();
@ -217,8 +190,6 @@ $(document).ready(function() {
endTime: moment(end).format(dateFormat),
allDay: allDay,
comments: $form.find('textarea[name="comments"]').val(),
createTicketDate: createTicketDate,
assignTo: assignTo,
action: 'update'
};
@ -261,10 +232,6 @@ function buildEvent(id, dbObject) {
};
}
var createTicketDate = null;
if (dbObject.createTicketDate != null) {
createTicketDate = moment(dbObject.createTicketDate);
}
return {
id: id,
title: dbObject.title,
@ -272,8 +239,6 @@ function buildEvent(id, dbObject) {
start: moment(dbObject.startTime),
end: moment(dbObject.endTime),
comments: dbObject.comments,
createTicketDate: createTicketDate,
assignTo: dbObject.assignTo,
location: dbObject.location,
type: dbObject.type
};
@ -283,8 +248,7 @@ function displayCreateModal(date, viewName) {
var $form = $('#create-form');
$form.find('input[name="name"]').val('').end()
.find('input[name="location"]').val('').end()
.find('textarea[name="comments"]').val('').end()
.find('input[name="create-ticket-date"]').val('').end();
.find('textarea[name="comments"]').val('').end();
var $modal = $('#create-event-modal');
var formattedDate = date.format('YYYY-MM-DD');
@ -325,10 +289,6 @@ function displayEditModal(date) {
.find('input[name="end-time"]').val(date.end.format('HH:mm:ss')).end();
}
if (date.createTicketDate != null) {
$form.find('input[name="create-ticket-date"]').val(date.createTicketDate.format('YYYY-MM-DD')).end();
}
$form.find('input[name="name"]').val(date.title).end()
.find('input[name="location"]').val(date.location).end()
.find('textarea[name="comments"]').val(date.comments).end()

Write Preview
Loading…
Cancel
Save