Peter M. Groen / knowledgetree

Commit 13676a68d1b839145f397cec08a20bf6d4198f61

Authored by bshuttle
1 parent a27870a2

fix for KTS-1374: sort by name, not id. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5992 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 7 changed files with 54 additions and 2 deletions
lib/groups/Group.inc
  View file @13676a6
... ... @@ -68,6 +68,14 @@ class Group extends KTEntity {
68 68 global $default;
69 69 return $default->groups_table;
70 70 }
  71 +
  72 + // STATIC
  73 + function _ktentityOptions() {
  74 + return array(
  75 + 'orderby' => 'name',
  76 + );
  77 + }
  78 +
71 79 // }}}
72 80  
73 81 // {{{ getters/setters
... ...
lib/ktentity.inc
  View file @13676a6
... ... @@ -375,6 +375,12 @@ class KTEntity {
375 375 }
376 376 return true;
377 377 }
  378 +
  379 + function _ktentityOptions() {
  380 + return array(
  381 + 'orderby' => 'id',
  382 + );
  383 + }
378 384 }
379 385  
380 386 class KTEntityUtil {
... ... @@ -388,6 +394,10 @@ class KTEntityUtil {
388 394 if (is_null($aOptions)) {
389 395 $aOptions = array();
390 396 }
  397 +
  398 + $aBaseOpts = call_user_func(array($sClassName, "_ktentityOptions"));
  399 + $aOptions = KTUtil::meldOptions($aBaseOpts, $aOptions);
  400 +
391 401 $bIDs = false;
392 402 $bIDs = KTUtil::arrayGet($aOptions, "ids", false);
393 403 $sIDField = 'id';
... ...
lib/roles/Role.inc
  View file @13676a6
... ... @@ -46,6 +46,14 @@ class Role extends KTEntity {
46 46 //object not yet created in database
47 47 $this->sName = $sNewName;
48 48 }
  49 +
  50 + // STATIC
  51 + function _ktentityOptions() {
  52 + return array(
  53 + 'orderby' => 'name',
  54 + );
  55 + }
  56 +
49 57  
50 58 var $_bUsePearError = true;
51 59  
... ...
lib/users/User.inc
  View file @13676a6
... ... @@ -102,9 +102,16 @@ class User extends KTEntity {
102 102 var $_bUsePearError = true;
103 103  
104 104 function _table() {
105   - global $default;
106   - return $default->users_table;
  105 + return KTUtil::getTableName("users");
107 106 }
  107 +
  108 + // STATIC
  109 + function _ktentityOptions() {
  110 + return array(
  111 + 'orderby' => 'name',
  112 + );
  113 + }
  114 +
108 115  
109 116 function getUserName() { return $this->sUserName; }
110 117 function setUserName($sNewValue) { $this->sUserName = $sNewValue; }
... ...
lib/workflow/workflow.inc.php
  View file @13676a6
... ... @@ -64,6 +64,12 @@ class KTWorkflow extends KTEntity {
64 64 return KTUtil::getTableName('workflows');
65 65 }
66 66  
  67 + function _ktentityOptions() {
  68 + return array(
  69 + 'orderby' => 'human_name',
  70 + );
  71 + }
  72 +
67 73 // STATIC
68 74 function &get($iId) {
69 75 return KTEntityUtil::get('KTWorkflow', $iId);
... ...
lib/workflow/workflowstate.inc.php
  View file @13676a6
... ... @@ -61,6 +61,12 @@ class KTWorkflowState extends KTEntity {
61 61 function _table () {
62 62 return KTUtil::getTableName('workflow_states');
63 63 }
  64 +
  65 + function _ktentityOptions() {
  66 + return array(
  67 + 'orderby' => 'human_name',
  68 + );
  69 + }
64 70  
65 71 // STATIC
66 72 function &get($iId) {
... ...
lib/workflow/workflowtransition.inc.php
  View file @13676a6
... ... @@ -80,6 +80,13 @@ class KTWorkflowTransition extends KTEntity {
80 80 function _table () {
81 81 return KTUtil::getTableName('workflow_transitions');
82 82 }
  83 +
  84 + // STATIC
  85 + function _ktentityOptions() {
  86 + return array(
  87 + 'orderby' => 'human_name',
  88 + );
  89 + }
83 90  
84 91 // STATIC
85 92 function &get($iId) {
... ...