holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add group description for accounts in sql too

Browse Source
This commit is contained in:
Ralf Becker 2015-02-18 17:37:07 +00:00
parent 5318ebdb21
commit 63cfd63c67
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -508,7 +508,7 @@ class accounts_sql
$accounts = array(); $accounts = array();
foreach((array) $GLOBALS['egw']->contacts->search($criteria, foreach((array) $GLOBALS['egw']->contacts->search($criteria,
"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id", "1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id",
$order,"account_lid,account_type,account_status,account_expires,account_primary_group", $order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
$wildcard,false,$query[0] == '!' ? 'AND' : 'OR', $wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
$param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']), $param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']),
$filter,$this->contacts_join) as $contact) $filter,$this->contacts_join) as $contact)
@ -530,6 +530,7 @@ class accounts_sql
// addressbook_bo::search() returns everything in user-time, need to convert to server-time // addressbook_bo::search() returns everything in user-time, need to convert to server-time
'account_created' => egw_time::user2server($contact['created']), 'account_created' => egw_time::user2server($contact['created']),
'account_modified' => egw_time::user2server($contact['modified']), 'account_modified' => egw_time::user2server($contact['modified']),
'account_description' => $contact['account_description'],
); );
} }
} }

3
phpgwapi/setup/setup.inc.php
View File

@ -12,7 +12,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'EGroupware API'; $setup_info['phpgwapi']['title'] = 'EGroupware API';
$setup_info['phpgwapi']['version'] = '14.2'; $setup_info['phpgwapi']['version'] = '15.0.001';
$setup_info['phpgwapi']['versions']['current_header'] = '1.29'; $setup_info['phpgwapi']['versions']['current_header'] = '1.29';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;
@ -74,3 +74,4 @@ $setup_info['groupdav']['license'] = 'GPL';
$setup_info['groupdav']['hooks']['preferences'] = 'groupdav_hooks::menus'; $setup_info['groupdav']['hooks']['preferences'] = 'groupdav_hooks::menus';
$setup_info['groupdav']['hooks']['settings'] = 'groupdav_hooks::settings'; $setup_info['groupdav']['hooks']['settings'] = 'groupdav_hooks::settings';

3
phpgwapi/setup/tables_current.inc.php
View File

@ -63,7 +63,8 @@ $phpgw_baseline = array(
'account_status' => array('type' => 'char','precision' => '1','nullable' => False,'default' => 'A'), 'account_status' => array('type' => 'char','precision' => '1','nullable' => False,'default' => 'A'),
'account_expires' => array('type' => 'int','precision' => '4'), 'account_expires' => array('type' => 'int','precision' => '4'),
'account_type' => array('type' => 'char','precision' => '1'), 'account_type' => array('type' => 'char','precision' => '1'),
'account_primary_group' => array('type' => 'int','meta' => 'group','precision' => '4','nullable' => False,'default' => '0') 'account_primary_group' => array('type' => 'int','meta' => 'group','precision' => '4','nullable' => False,'default' => '0'),
'account_description' => array('type' => 'varchar','precision' => '255','comment' => 'group description')
), ),
'pk' => array('account_id'), 'pk' => array('account_id'),
'fk' => array(), 'fk' => array(),

13
phpgwapi/setup/tables_update.inc.php
View File

@ -59,4 +59,15 @@ function phpgwapi_upgrade14_1_900()
$GLOBALS['egw_setup']->add_acl('phpgwapi', 'anonymous', $anonymous); $GLOBALS['egw_setup']->add_acl('phpgwapi', 'anonymous', $anonymous);
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.2'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.2';
} }
function phpgwapi_upgrade14_2()
{
$GLOBALS['egw_setup']->oProc->AddColumn('egw_accounts','account_description',array(
'type' => 'varchar',
'precision' => '255',
'comment' => 'group description'
));
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '15.0.001';
}