diff --git a/scp/ajax.php b/scp/ajax.php index 2b08168adda9664f710f8b4abaa47cb4c0b78801..2398ca68f0f1b5be0bad37f3be2955051b037f76 100644 --- a/scp/ajax.php +++ b/scp/ajax.php @@ -46,15 +46,13 @@ $dispatcher = patterns('', url_get('^ui', 'scp_ui') )), url_get('^/users$', array('ajax.users.php:UsersAjaxAPI', 'search')), - url('^/tickets', patterns('ajax.tickets.php:TicketsAjaxAPI', - url_get('^/lookup', 'lookup'), - url_get('^$', 'search') - )), - url('^/ticket/', patterns('ajax.tickets.php:TicketsAjaxAPI', + url('^/tickets/', patterns('ajax.tickets.php:TicketsAjaxAPI', url_get('^(?P<tid>\d+)/preview', 'previewTicket'), url_get('^(?P<tid>\d+)/lock', 'acquireLock'), url_post('^(?P<tid>\d+)/lock/(?P<id>\d+)/renew', 'renewLock'), - url_post('^(?P<tid>\d+)/lock/(?P<id>\d+)/release', 'releaseLock') + url_post('^(?P<tid>\d+)/lock/(?P<id>\d+)/release', 'releaseLock'), + url_get('^lookup', 'lookup'), + url_get('^search', 'search') )) ); diff --git a/scp/js/scp.js b/scp/js/scp.js index 56f776ed6ff4ef0a6a20a54ef3837d957a487949..071c63ff82cb339fdfc8517136672910efeb41f3 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -286,7 +286,7 @@ $(document).ready(function(){ var elem = $('#advanced-search'); $('#result-count').html(''); $.ajax({ - url: "ajax.php/tickets", + url: "ajax.php/tickets/search", data: fObj.serialize(), dataType: 'json', beforeSend: function ( xhr ) { diff --git a/scp/js/ticket.js b/scp/js/ticket.js index 902298ce43f64240a819282967a45f984ce2a424..f981bae070194dd478454edb5f308c341ce015cd 100644 --- a/scp/js/ticket.js +++ b/scp/js/ticket.js @@ -153,7 +153,7 @@ var autoLock = { } else { $.ajax({ type: "GET", - url: 'ajax.php/ticket/'+autoLock.tid+'/lock', + url: 'ajax.php/tickets/'+autoLock.tid+'/lock', dataType: 'json', cache: false, success: function(lock){ @@ -176,7 +176,7 @@ var autoLock = { if(!autoLock.lastcheckTime || (now-autoLock.lastcheckTime)>=(autoLock.renewFreq*1000)){ $.ajax({ type: 'POST', - url: 'ajax.php/ticket/'+autoLock.tid+'/lock/'+autoLock.lockId+'/renew', + url: 'ajax.php/tickets/'+autoLock.tid+'/lock/'+autoLock.lockId+'/renew', dataType: 'json', cache: false, success: function(lock){ @@ -193,7 +193,7 @@ var autoLock = { $.ajax({ type: 'POST', - url: 'ajax.php/ticket/'+autoLock.tid+'/lock/'+autoLock.lockId+'/release', + url: 'ajax.php/tickets/'+autoLock.tid+'/lock/'+autoLock.lockId+'/release', data: 'delete', cache: false, success: function(){ diff --git a/scp/js/tips.js b/scp/js/tips.js index ec0f1875d55f31e5b8e9afcf283d7700183ea6e8..c560b8d913e635047e98e7a8198262a9db2809fc 100644 --- a/scp/js/tips.js +++ b/scp/js/tips.js @@ -80,7 +80,7 @@ jQuery(function($) { var elem = $(this); var vars = elem.attr('href').split('='); - var url = 'ajax.php/ticket/'+vars[1]+'/preview'; + var url = 'ajax.php/tickets/'+vars[1]+'/preview'; var id='t'+vars[1]; var xoffset = 80;