phpgw_categories --> egw_categories plus reworked categories class

This commit is contained in:
Ralf Becker 2005-11-05 22:58:51 +00:00
parent 2ec277c0d9
commit 7635fb25c9
6 changed files with 402 additions and 515 deletions

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@
/* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'API';
$setup_info['phpgwapi']['version'] = '1.0.1.019';
$setup_info['phpgwapi']['version'] = '1.0.1.020';
$setup_info['phpgwapi']['versions']['current_header'] = '1.28';
$setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1;
@ -32,7 +32,7 @@
$setup_info['phpgwapi']['tables'][] = 'egw_languages';
$setup_info['phpgwapi']['tables'][] = 'egw_lang';
$setup_info['phpgwapi']['tables'][] = 'phpgw_nextid';
$setup_info['phpgwapi']['tables'][] = 'phpgw_categories';
$setup_info['phpgwapi']['tables'][] = 'egw_categories';
$setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook';
$setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook_extra';
$setup_info['phpgwapi']['tables'][] = 'egw_log';

View File

@ -170,7 +170,7 @@
'ix' => array(),
'uc' => array('appname')
),
'phpgw_categories' => array(
'egw_categories' => array(
'fd' => array(
'cat_id' => array('type' => 'auto','precision' => '4','nullable' => False),
'cat_main' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),

View File

@ -790,4 +790,15 @@
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.019';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
$test[] = '1.0.1.019';
function phpgwapi_upgrade1_0_1_019()
{
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_categories','egw_categories');
$GLOBALS['egw_setup']->cats_table = 'egw_categories';
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.020';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
?>

View File

@ -159,8 +159,8 @@
}
// delete all application categories and ACL
$GLOBALS['egw_setup']->db->query("DELETE FROM phpgw_categories WHERE cat_appname='$appname'",__LINE__,__FILE__);
$GLOBALS['egw_setup']->db->query("DELETE FROM {$GLOBALS['egw_setup']->acl_table} WHERE acl_appname='$appname'",__LINE__,__FILE__);
$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table,array('cat_appname' => $appname),__LINE__,__FILE__);
$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table,array('acl_appname' => $appname),__LINE__,__FILE__);
}
}

View File

@ -35,7 +35,7 @@
var $lang_table = 'egw_lang';
var $languages_table = 'egw_languages';
var $hooks_table = 'phpgw_hooks';
var $cats_table = 'phpgw_categories';
var $cats_table = 'egw_categories';
var $oProc;
var $detection = '';