Skip to content
Snippets Groups Projects
Commit 8d442a61 authored by Peter Rotich's avatar Peter Rotich
Browse files

Fixes after initial review

parent 59624abc
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/staff/templates/user-lookup.tmpl.php
+ 1
− 1
View file @ 8d442a61
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<b><a class="close" href="#"><i class="icon-remove-circle"></i></a></b> <b><a class="close" href="#"><i class="icon-remove-circle"></i></a></b>
<hr/> <hr/>
<div><p id="msg_info"><i class="icon-info-sign"></i>&nbsp; Search existing users or add a new user.</p></div> <div><p id="msg_info"><i class="icon-info-sign"></i>&nbsp; Search existing users or add a new user.</p></div>
<div><input type="text" style="width:100%;" placeholder="Search by email, phone or name" id="user-search"/></div> <div style="margin-bottom:10px;"><input type="text" class="search-input" style="width:100%;" placeholder="Search by email, phone or name" id="user-search"/></div>
<?php <?php
if ($info['error']) { if ($info['error']) {
echo sprintf('<p id="msg_error">%s</p>', $info['error']); echo sprintf('<p id="msg_error">%s</p>', $info['error']);
......
scp/css/scp.css
+ 4
− 0
View file @ 8d442a61
...@@ -20,6 +20,10 @@ a { ...@@ -20,6 +20,10 @@ a {
width: 100%; width: 100%;
} }
.search-input {
height: 20px;
}
.clear { .clear {
clear:both; clear:both;
} }
......
scp/js/scp.js
+ 1
− 1
View file @ 8d442a61
...@@ -423,7 +423,7 @@ $(document).ready(function(){ ...@@ -423,7 +423,7 @@ $(document).ready(function(){
if(callback) callback(user); if(callback) callback(user);
} else { } else {
$('div.body', $dialog).html(resp); $('div.body', $dialog).html(resp);
$('#msg_notice, #msg_error', $dialog).delay(5000).fadeOut(); $('#msg_notice, #msg_error', $dialog).delay(5000).slideUp();
} }
} }
}) })
......
scp/tickets.php
+ 11
− 11
View file @ 8d442a61
...@@ -202,7 +202,7 @@ if($_POST && !$errors): ...@@ -202,7 +202,7 @@ if($_POST && !$errors):
if (!$form->isValid()) if (!$form->isValid())
$errors = array_merge($errors, $form->errors()); $errors = array_merge($errors, $form->errors());
if(!$ticket || !$thisstaff->canEditTickets()) if(!$ticket || !$thisstaff->canEditTickets())
$errors['err']='Perm. Denied. You are not allowed to edit tickets'; $errors['err']='Permission Denied. You are not allowed to edit tickets';
elseif($ticket->update($_POST,$errors)) { elseif($ticket->update($_POST,$errors)) {
$msg='Ticket updated successfully'; $msg='Ticket updated successfully';
$_REQUEST['a'] = null; //Clear edit action - going back to view. $_REQUEST['a'] = null; //Clear edit action - going back to view.
...@@ -218,7 +218,7 @@ if($_POST && !$errors): ...@@ -218,7 +218,7 @@ if($_POST && !$errors):
switch(strtolower($_POST['do'])): switch(strtolower($_POST['do'])):
case 'close': case 'close':
if(!$thisstaff->canCloseTickets()) { if(!$thisstaff->canCloseTickets()) {
$errors['err'] = 'Perm. Denied. You are not allowed to close tickets.'; $errors['err'] = 'Permission Denied. You are not allowed to close tickets.';
} elseif($ticket->isClosed()) { } elseif($ticket->isClosed()) {
$errors['err'] = 'Ticket is already closed!'; $errors['err'] = 'Ticket is already closed!';
} elseif($ticket->close()) { } elseif($ticket->close()) {
...@@ -242,7 +242,7 @@ if($_POST && !$errors): ...@@ -242,7 +242,7 @@ if($_POST && !$errors):
case 'reopen': case 'reopen':
//if staff can close or create tickets ...then assume they can reopen. //if staff can close or create tickets ...then assume they can reopen.
if(!$thisstaff->canCloseTickets() && !$thisstaff->canCreateTickets()) { if(!$thisstaff->canCloseTickets() && !$thisstaff->canCreateTickets()) {
$errors['err']='Perm. Denied. You are not allowed to reopen tickets.'; $errors['err']='Permission Denied. You are not allowed to reopen tickets.';
} elseif($ticket->isOpen()) { } elseif($ticket->isOpen()) {
$errors['err'] = 'Ticket is already open!'; $errors['err'] = 'Ticket is already open!';
} elseif($ticket->reopen()) { } elseif($ticket->reopen()) {
...@@ -271,7 +271,7 @@ if($_POST && !$errors): ...@@ -271,7 +271,7 @@ if($_POST && !$errors):
break; break;
case 'claim': case 'claim':
if(!$thisstaff->canAssignTickets()) { if(!$thisstaff->canAssignTickets()) {
$errors['err'] = 'Perm. Denied. You are not allowed to assign/claim tickets.'; $errors['err'] = 'Permission Denied. You are not allowed to assign/claim tickets.';
} elseif(!$ticket->isOpen()) { } elseif(!$ticket->isOpen()) {
$errors['err'] = 'Only open tickets can be assigned'; $errors['err'] = 'Only open tickets can be assigned';
} elseif($ticket->isAssigned()) { } elseif($ticket->isAssigned()) {
...@@ -285,7 +285,7 @@ if($_POST && !$errors): ...@@ -285,7 +285,7 @@ if($_POST && !$errors):
case 'overdue': case 'overdue':
$dept = $ticket->getDept(); $dept = $ticket->getDept();
if(!$dept || !$dept->isManager($thisstaff)) { if(!$dept || !$dept->isManager($thisstaff)) {
$errors['err']='Perm. Denied. You are not allowed to flag tickets overdue'; $errors['err']='Permission Denied. You are not allowed to flag tickets overdue';
} elseif($ticket->markOverdue()) { } elseif($ticket->markOverdue()) {
$msg='Ticket flagged as overdue'; $msg='Ticket flagged as overdue';
$ticket->logActivity('Ticket Marked Overdue',($msg.' by '.$thisstaff->getName())); $ticket->logActivity('Ticket Marked Overdue',($msg.' by '.$thisstaff->getName()));
...@@ -296,7 +296,7 @@ if($_POST && !$errors): ...@@ -296,7 +296,7 @@ if($_POST && !$errors):
case 'answered': case 'answered':
$dept = $ticket->getDept(); $dept = $ticket->getDept();
if(!$dept || !$dept->isManager($thisstaff)) { if(!$dept || !$dept->isManager($thisstaff)) {
$errors['err']='Perm. Denied. You are not allowed to flag tickets'; $errors['err']='Permission Denied. You are not allowed to flag tickets';
} elseif($ticket->markAnswered()) { } elseif($ticket->markAnswered()) {
$msg='Ticket flagged as answered'; $msg='Ticket flagged as answered';
$ticket->logActivity('Ticket Marked Answered',($msg.' by '.$thisstaff->getName())); $ticket->logActivity('Ticket Marked Answered',($msg.' by '.$thisstaff->getName()));
...@@ -307,7 +307,7 @@ if($_POST && !$errors): ...@@ -307,7 +307,7 @@ if($_POST && !$errors):
case 'unanswered': case 'unanswered':
$dept = $ticket->getDept(); $dept = $ticket->getDept();
if(!$dept || !$dept->isManager($thisstaff)) { if(!$dept || !$dept->isManager($thisstaff)) {
$errors['err']='Perm. Denied. You are not allowed to flag tickets'; $errors['err']='Permission Denied. You are not allowed to flag tickets';
} elseif($ticket->markUnAnswered()) { } elseif($ticket->markUnAnswered()) {
$msg='Ticket flagged as unanswered'; $msg='Ticket flagged as unanswered';
$ticket->logActivity('Ticket Marked Unanswered',($msg.' by '.$thisstaff->getName())); $ticket->logActivity('Ticket Marked Unanswered',($msg.' by '.$thisstaff->getName()));
...@@ -317,7 +317,7 @@ if($_POST && !$errors): ...@@ -317,7 +317,7 @@ if($_POST && !$errors):
break; break;
case 'banemail': case 'banemail':
if(!$thisstaff->canBanEmails()) { if(!$thisstaff->canBanEmails()) {
$errors['err']='Perm. Denied. You are not allowed to ban emails'; $errors['err']='Permission Denied. You are not allowed to ban emails';
} elseif(BanList::includes($ticket->getEmail())) { } elseif(BanList::includes($ticket->getEmail())) {
$errors['err']='Email already in banlist'; $errors['err']='Email already in banlist';
} elseif(Banlist::add($ticket->getEmail(),$thisstaff->getName())) { } elseif(Banlist::add($ticket->getEmail(),$thisstaff->getName())) {
...@@ -328,7 +328,7 @@ if($_POST && !$errors): ...@@ -328,7 +328,7 @@ if($_POST && !$errors):
break; break;
case 'unbanemail': case 'unbanemail':
if(!$thisstaff->canBanEmails()) { if(!$thisstaff->canBanEmails()) {
$errors['err'] = 'Perm. Denied. You are not allowed to remove emails from banlist.'; $errors['err'] = 'Permission Denied. You are not allowed to remove emails from banlist.';
} elseif(Banlist::remove($ticket->getEmail())) { } elseif(Banlist::remove($ticket->getEmail())) {
$msg = 'Email removed from banlist'; $msg = 'Email removed from banlist';
} elseif(!BanList::includes($ticket->getEmail())) { } elseif(!BanList::includes($ticket->getEmail())) {
...@@ -339,7 +339,7 @@ if($_POST && !$errors): ...@@ -339,7 +339,7 @@ if($_POST && !$errors):
break; break;
case 'changeuser': case 'changeuser':
if (!$thisstaff->canEditTickets()) { if (!$thisstaff->canEditTickets()) {
$errors['err'] = 'Perm. Denied. You are not allowed to EDIT tickets!!'; $errors['err'] = 'Permission Denied. You are not allowed to EDIT tickets!!';
} elseif (!$_POST['user_id'] || !($user=User::lookup($_POST['user_id']))) { } elseif (!$_POST['user_id'] || !($user=User::lookup($_POST['user_id']))) {
$errors['err'] = 'Unknown user selected!'; $errors['err'] = 'Unknown user selected!';
} elseif ($ticket->changeOwner($user)) { } elseif ($ticket->changeOwner($user)) {
...@@ -350,7 +350,7 @@ if($_POST && !$errors): ...@@ -350,7 +350,7 @@ if($_POST && !$errors):
break; break;
case 'delete': // Dude what are you trying to hide? bad customer support?? case 'delete': // Dude what are you trying to hide? bad customer support??
if(!$thisstaff->canDeleteTickets()) { if(!$thisstaff->canDeleteTickets()) {
$errors['err']='Perm. Denied. You are not allowed to DELETE tickets!!'; $errors['err']='Permission Denied. You are not allowed to DELETE tickets!!';
} elseif($ticket->delete()) { } elseif($ticket->delete()) {
$msg='Ticket #'.$ticket->getNumber().' deleted successfully'; $msg='Ticket #'.$ticket->getNumber().' deleted successfully';
//Log a debug note //Log a debug note
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment