From d6555add9ba9c42fc0ba7de48c6a171fa1c1eb53 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 29 Apr 2014 14:08:09 +0000
Subject: [PATCH] Show user search/lookup box.
Show user search box when adding a new user
---
include/ajax.users.php | 16 +++++++---------
scp/ajax.php | 2 +-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/ajax.users.php b/include/ajax.users.php
index a523695e5..b17d742a4 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -233,17 +233,19 @@ class UsersAjaxAPI extends AjaxController {
return self::_lookupform(null, $info);
}
+ function lookup() {
+ return self::addUser();
+ }
+
function addUser() {
$info = array();
- $info['title'] = 'Add New User';
-
- $info['lookup'] = 'remote';
if (!AuthenticationBackend::getSearchDirectories())
- $info['lookup'] = false;
+ $info['lookup'] = 'local';
if ($_POST) {
+ $info['title'] = 'Add New User';
$form = UserForm::getUserForm()->getForm($_POST);
if (($user = User::fromForm($form)))
Http::response(201, $user->to_json());
@@ -297,10 +299,6 @@ class UsersAjaxAPI extends AjaxController {
include STAFFINC_DIR . 'templates/user-import.tmpl.php';
}
- function getLookupForm() {
- return self::_lookupform();
- }
-
function selectUser($id) {
if ($id)
@@ -319,7 +317,7 @@ class UsersAjaxAPI extends AjaxController {
static function _lookupform($form=null, $info=array()) {
if (!$info or !$info['title'])
- $info += array('title' => 'Select or Create a Client');
+ $info += array('title' => 'Lookup or create a user');
ob_start();
include(STAFFINC_DIR . 'templates/user-lookup.tmpl.php');
diff --git a/scp/ajax.php b/scp/ajax.php
index ff6703a5a..6f784080b 100644
--- a/scp/ajax.php
+++ b/scp/ajax.php
@@ -76,7 +76,7 @@ $dispatcher = patterns('',
url_get('^/(?P<id>\d+)/preview$', 'preview'),
url_get('^/(?P<id>\d+)/edit$', 'editUser'),
url('^/lookup$', 'getUser'),
- url_get('^/lookup/form$', 'getLookupForm'),
+ url_get('^/lookup/form$', 'lookup'),
url_post('^/lookup/form$', 'addUser'),
url_get('^/add$', 'addUser'),
url('^/import$', 'importUsers'),
--
GitLab