Peter M. Groen / knowledgetree

Commit 4b6068883e3e3bf291b4837c74ecd7ae3c10bb1c

Authored by kevin_fourie
1 parent 9c4aa636

Merged in from DEV trunk... 

KTS-3257
"CLONE -Advanced Search - List User Names in Alphabetical Order (SUP-715)"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Philip Arkoll


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8425 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 10 additions and 8 deletions
search2/search/search.inc.php
  View file @4b60688
... ... @@ -357,14 +357,16 @@ class SearchHelper
357 357 document_type_fields_link dtfl
358 358 INNER JOIN document_fields df on dtfl.field_id=df.id
359 359 WHERE
360   - dtfl.document_type_id=$documentTypeID";
  360 + dtfl.document_type_id=$documentTypeID
  361 + ORDER BY
  362 + df.name";
361 363  
362 364  
363 365 }
364 366 else
365 367 {
366 368 $fieldsetID = sanitizeForSQL($fieldsetID);
367   - $sql = "SELECT id, name, data_type, has_lookup, has_lookuptree, description FROM document_fields WHERE parent_fieldset=$fieldsetID";
  369 + $sql = "SELECT id, name, data_type, has_lookup, has_lookuptree, description FROM document_fields WHERE parent_fieldset=$fieldsetID ORDER BY name";
368 370 }
369 371  
370 372 $rs = DBUtil::getResultArray($sql);
... ... @@ -423,7 +425,7 @@ class SearchHelper
423 425  
424 426 public static function getFieldsets()
425 427 {
426   - $sql = "SELECT id, name, description FROM fieldsets WHERE disabled=0";
  428 + $sql = "SELECT id, name, description FROM fieldsets WHERE disabled=0 ORDER BY name";
427 429 $rs = DBUtil::getResultArray($sql);
428 430  
429 431 return $rs;
... ... @@ -445,34 +447,34 @@ class SearchHelper
445 447  
446 448 public static function getDocumentTypes()
447 449 {
448   - $sql = "SELECT id, name from document_types_lookup WHERE disabled=0";
  450 + $sql = "SELECT id, name from document_types_lookup WHERE disabled=0 ORDER BY name";
449 451 $rs = DBUtil::getResultArray($sql);
450 452 return $rs;
451 453 }
452 454  
453 455 public static function getMimeTypes() {
454   - $sql = "SELECT DISTINCT mimetypes as name FROM mime_types order by mimetypes ";
  456 + $sql = "SELECT DISTINCT mimetypes as name FROM mime_types ORDER BY mimetypes ";
455 457 $rs = DBUtil::getResultArray($sql);
456 458 return $rs;
457 459 }
458 460  
459 461 public static function getWorkflows()
460 462 {
461   - $sql = "SELECT id, human_name as name FROM workflows WHERE enabled=1";
  463 + $sql = "SELECT id, human_name as name FROM workflows WHERE enabled=1 ORDER BY human_name";
462 464 $rs = DBUtil::getResultArray($sql);
463 465 return $rs;
464 466 }
465 467  
466 468 public static function getUsers()
467 469 {
468   - $sql = "SELECT id, name FROM users WHERE disabled=0";
  470 + $sql = "SELECT id, name FROM users WHERE disabled=0 ORDER BY name";
469 471 $rs = DBUtil::getResultArray($sql);
470 472 return $rs;
471 473 }
472 474  
473 475 public static function getWorkflowStates($workflowid)
474 476 {
475   - $sql = "SELECT id,human_name as name FROM workflow_states WHERE workflow_id=$workflowid";
  477 + $sql = "SELECT id,human_name as name FROM workflow_states WHERE workflow_id=$workflowid ORDER BY id";
476 478 $rs = DBUtil::getResultArray($sql);
477 479 return $rs;
478 480 }
... ...