Skip to content
Snippets Groups Projects
Commit 5c4556ef authored by Jared Hancock's avatar Jared Hancock
Browse files

Merge remote branch 'upstream/develop' into develop

parents 42afce1e c5a1c46b
Branches
Tags
No related merge requests found
...@@ -23,3 +23,7 @@ ...@@ -23,3 +23,7 @@
} }
#loading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; } #loading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; }
input.dp {
width: 10em;
}
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->canEditTickets() || !$ticket) die('Access Denied'); if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->canEditTickets() || !$ticket) die('Access Denied');
$info=Format::htmlchars(($errors && $_POST)?$_POST:$ticket->getUpdateInfo()); $info=Format::htmlchars(($errors && $_POST)?$_POST:$ticket->getUpdateInfo());
if ($_POST)
$info['duedate'] = Format::date($cfg->getDateFormat(),
strtotime($info['duedate']));
?> ?>
<form action="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit" method="post" id="save" enctype="multipart/form-data"> <form action="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit" method="post" id="save" enctype="multipart/form-data">
<?php csrf_token(); ?> <?php csrf_token(); ?>
......
...@@ -1404,3 +1404,6 @@ ul.progress li.no small {color:red;} ...@@ -1404,3 +1404,6 @@ ul.progress li.no small {color:red;}
#loading h4, #upgrading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; } #loading h4, #upgrading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; }
input.dp {
width: 10em;
}
...@@ -299,7 +299,14 @@ $(document).ready(function(){ ...@@ -299,7 +299,14 @@ $(document).ready(function(){
buttonImage: './images/cal.png', buttonImage: './images/cal.png',
showOn:'both', showOn:'both',
dateFormat: df, dateFormat: df,
}); });
$(document).on('submit', 'form', function() {
$('.dp', $(this)).each(function(i, e) {
var $e = $(e),
d = $e.datepicker('getDate');
$e.val(d.toJSON().substring(0,10));
});
});
}); });
/* NicEdit richtext init */ /* NicEdit richtext init */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment