From 6960ee4e35172d58d611ff4e3239a2293731fe86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Tue, 8 Feb 2005 19:36:22 +0000 Subject: [PATCH] *** empty log message *** --- resources/setup/etemplates.inc.php | 27 +++ resources/setup/old/tables_baseline.inc.php | 28 ---- .../setup/old/tables_current.old.inc.php | 38 ----- resources/setup/old/tables_update.inc.php | 158 ------------------ resources/setup/old/tables_update.old.inc.php | 144 ---------------- .../setup/{old => }/tables_current.inc.php | 4 +- 6 files changed, 29 insertions(+), 370 deletions(-) create mode 100644 resources/setup/etemplates.inc.php delete mode 100755 resources/setup/old/tables_baseline.inc.php delete mode 100755 resources/setup/old/tables_current.old.inc.php delete mode 100755 resources/setup/old/tables_update.inc.php delete mode 100755 resources/setup/old/tables_update.old.inc.php rename resources/setup/{old => }/tables_current.inc.php (92%) diff --git a/resources/setup/etemplates.inc.php b/resources/setup/etemplates.inc.php new file mode 100644 index 0000000000..3cf00ee3f1 --- /dev/null +++ b/resources/setup/etemplates.inc.php @@ -0,0 +1,27 @@ + 'resources.add','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:21:"resources.add_buttons";}}}','size' => '100%','style' => '','modified' => '1094579218',); + +$templ_data[] = array('name' => 'resources.add_buttons','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:1:{s:1:"C";s:4:"100%";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:21:"Saves entry and exits";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:5:"right";}}}','size' => '100%','style' => '','modified' => '1094579498',); + +$templ_data[] = array('name' => 'resources.edit','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:19:"resources.edit_tabs";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"resources.edit_buttons";}}}','size' => '100%','style' => '','modified' => '1099310308',); + +$templ_data[] = array('name' => 'resources.edit_buttons','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:1:{s:1:"C";s:4:"100%";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:21:"Saves entry and exits";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:6:"delete";}}}','size' => '100%','style' => '','modified' => '1093597552',); + +$templ_data[] = array('name' => 'resources.edit_tabs','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:4:{i:0;a:3:{s:1:"A";s:3:"250";s:2:"c1";s:6:"row_on";s:2:"c2";s:7:"row_off";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";s:4:"help";s:16:"Name of resource";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:10:"select one";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";s:4:"help";s:44:"Which category does this resource belong to?";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:60:"General|Accessories|Pictures|Page|Location|Prizeing|Calendar";s:4:"name";s:60:"general|accessories|pictures|page|location|prizeing|calendar";s:4:"help";s:194:"General informations about resource|Informations about the location of resource|Prizeing information for booking or buying|Web-Page of resource|Pictures or resource|The Calendar of this resource";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}','size' => '100%','style' => '','modified' => '1094577031',); + +$templ_data[] = array('name' => 'resources.edit_tabs.general','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:7:{i:0;a:1:{s:1:"C";s:2:"10";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Description (short)";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"50,100";s:4:"name";s:17:"short_description";s:4:"help";s:29:"Short description of resource";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:29:"Short description of resource";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"50,100";s:4:"name";s:8:"location";s:4:"help";s:20:"Location of resource";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:28:"Where to find this resource?";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,10";s:4:"name";s:8:"quantity";s:4:"help";s:20:"Quantity of resource";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Quantity of resource";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Useable";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,10";s:4:"name";s:7:"useable";s:4:"help";s:29:"How many of them are useable?";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:38:"How many of the resources are useable?";}}i:5;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Bookable";}s:1:"B";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:8:"bookable";s:4:"help";s:21:"Is resource bookable?";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:26:"Is this resource bookable?";}}i:6;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Buyable";}s:1:"B";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"buyable";s:4:"help";s:20:"Is resource buyable?";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:25:"Is this resource buyable?";}}}','size' => '100%','style' => '','modified' => '1093597682',); + +$templ_data[] = array('name' => 'resources.edit_tabs.page','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"htmlarea";s:4:"name";s:16:"long_description";s:4:"help";s:26:"Web-Site for this resource";}}}','size' => '100%','style' => '','modified' => '1093599237',); + +$templ_data[] = array('name' => 'resources.show','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:19:"resources.show.rows";s:4:"name";s:2:"nm";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}}}','size' => '100%','style' => '','modified' => '1098892283',); + +$templ_data[] = array('name' => 'resources.show.actions','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:3:{i:0;a:3:{s:1:"F";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}s:1:"F";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:29:"resources.show.actions_header";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[usable]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[category]";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}s:1:"F";a:3:{s:4:"type";s:6:"button";s:5:"align";s:5:"right";s:4:"name";s:20:"lukas[$row_cont[id]]";}}}','size' => '100%','style' => '','modified' => '1098891355',); + +$templ_data[] = array('name' => 'resources.show.actions_header','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:4:"name";s:30:"javascript:check_all(\'select\')";}}}','size' => '','style' => '','modified' => '1094025049',); + +$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:3:{i:0;a:3:{s:1:"G";s:2:"3%";s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Picture";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:17:"Short description";s:4:"name";s:17:"short_description";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}s:1:"G";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:29:"resources.show.actions_header";}}i:2;a:7:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:47:"resources.bo_resources.get_images,$row_cont[id]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"${row}[short_description]";}s:1:"D";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:15:"${row}[useable]";}s:1:"E";a:4:{s:4:"type";s:10:"select-cat";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}s:1:"G";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";s:5:"align";s:5:"right";i:1;a:3:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:4:"name";s:19:"view[$row_cont[id]]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"size";s:10:"browse.gif";s:4:"name";s:19:"book[$row_cont[id]]";}i:3;a:3:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:3:{s:4:"type";s:6:"button";s:4:"size";s:10:"delete.gif";s:4:"name";s:21:"delete[$row_cont[id]]";}i:5;a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:20:"check[$row_cont[id]]";}}}}','size' => '100%','style' => '','modified' => '1107886236',); + diff --git a/resources/setup/old/tables_baseline.inc.php b/resources/setup/old/tables_baseline.inc.php deleted file mode 100755 index 50b9714678..0000000000 --- a/resources/setup/old/tables_baseline.inc.php +++ /dev/null @@ -1,28 +0,0 @@ - array( - 'fd' => array( - 'id' => array('type' => 'auto'), - 'name' => array('type' => 'varchar','precision' => '100'), - 'short_descreption' => array('type' => 'varchar','precision' => '100') - ), - 'pk' => array('id'), - 'fk' => array(), - 'ix' => array(), - 'uc' => array() - ) - ); diff --git a/resources/setup/old/tables_current.old.inc.php b/resources/setup/old/tables_current.old.inc.php deleted file mode 100755 index 03183390e0..0000000000 --- a/resources/setup/old/tables_current.old.inc.php +++ /dev/null @@ -1,38 +0,0 @@ - array( - 'fd' => array( - 'id' => array('type' => 'auto'), - 'name' => array('type' => 'varchar','precision' => '100'), - 'short_description' => array('type' => 'varchar','precision' => '100'), - 'cat_id' => array('type' => 'varchar','precision' => '11','nullable' => False), - 'quantity' => array('type' => 'varchar','precision' => '11'), - 'useable' => array('type' => 'varchar','precision' => '11'), - 'location' => array('type' => 'varchar','precision' => '100'), - 'bookable' => array('type' => 'varchar','precision' => '1'), - 'buyable' => array('type' => 'varchar','precision' => '1'), - 'prize' => array('type' => 'varchar','precision' => '200'), - 'long_description' => array('type' => 'longtext'), - 'picture' => array('type' => 'blob'), - 'accessories' => array('type' => 'varchar','precision' => '50') - ), - 'pk' => array('id'), - 'fk' => array(), - 'ix' => array(), - 'uc' => array() - ) - ); diff --git a/resources/setup/old/tables_update.inc.php b/resources/setup/old/tables_update.inc.php deleted file mode 100755 index f03be9eb14..0000000000 --- a/resources/setup/old/tables_update.inc.php +++ /dev/null @@ -1,158 +0,0 @@ -oProc->AddColumn('egw_resources','cat_id',array( - 'type' => 'int', - 'precision' => '11' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '001'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = ''; - function resources_upgrade() - { - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','quantity',array( - 'type' => 'int', - 'precision' => '11' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '001'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = ''; - function resources_upgrade() - { - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','useable',array( - 'type' => 'int', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','location',array( - 'type' => 'varchar', - 'precision' => '100' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '001'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = ''; - function resources_upgrade() - { - $GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources','short_descreption','short_description'); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','bookable',array( - 'type' => 'int', - 'precision' => '1' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','buyable',array( - 'type' => 'int', - 'precision' => '1' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','prize',array( - 'type' => 'varchar', - 'precision' => '200' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','long_description',array( - 'type' => 'longtext' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture',array( - 'type' => 'blob' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessories',array( - 'type' => 'varchar', - 'precision' => '50' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '008'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.008'; - function resources_upgrade0_0_1_008() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'int', - 'precision' => '2' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.008'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.008'; - function resources_upgrade0_0_1_008() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'varchar', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','quantity',array( - 'type' => 'varchar', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','useable',array( - 'type' => 'varchar', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','bookable',array( - 'type' => 'varchar', - 'precision' => '1' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','buyable',array( - 'type' => 'varchar', - 'precision' => '1' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.008'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.008'; - function resources_upgrade0_0_1_008() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'varchar', - 'precision' => '11', - 'nullable' => False - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.009'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.009'; - function resources_upgrade0_0_1_009() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'int', - 'precision' => '11', - 'nullable' => False - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.010'; - return $GLOBALS['setup_info']['resources']['currentver']; - } -?> diff --git a/resources/setup/old/tables_update.old.inc.php b/resources/setup/old/tables_update.old.inc.php deleted file mode 100755 index 27c3015976..0000000000 --- a/resources/setup/old/tables_update.old.inc.php +++ /dev/null @@ -1,144 +0,0 @@ -oProc->AddColumn('egw_resources','cat_id',array( - 'type' => 'int', - 'precision' => '11' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '001'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = ''; - function resources_upgrade() - { - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','quantity',array( - 'type' => 'int', - 'precision' => '11' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '001'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = ''; - function resources_upgrade() - { - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','useable',array( - 'type' => 'int', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','location',array( - 'type' => 'varchar', - 'precision' => '100' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '001'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = ''; - function resources_upgrade() - { - $GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources','short_descreption','short_description'); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','bookable',array( - 'type' => 'int', - 'precision' => '1' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','buyable',array( - 'type' => 'int', - 'precision' => '1' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','prize',array( - 'type' => 'varchar', - 'precision' => '200' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','long_description',array( - 'type' => 'longtext' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture',array( - 'type' => 'blob' - )); - $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessories',array( - 'type' => 'varchar', - 'precision' => '50' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '008'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.008'; - function resources_upgrade0_0_1_008() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'int', - 'precision' => '2' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.008'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.008'; - function resources_upgrade0_0_1_008() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'varchar', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','quantity',array( - 'type' => 'varchar', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','useable',array( - 'type' => 'varchar', - 'precision' => '11' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','bookable',array( - 'type' => 'varchar', - 'precision' => '1' - )); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','buyable',array( - 'type' => 'varchar', - 'precision' => '1' - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.008'; - return $GLOBALS['setup_info']['resources']['currentver']; - } - - - $test[] = '0.0.1.008'; - function resources_upgrade0_0_1_008() - { - $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','cat_id',array( - 'type' => 'varchar', - 'precision' => '11', - 'nullable' => False - )); - - $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.009'; - return $GLOBALS['setup_info']['resources']['currentver']; - } -?> diff --git a/resources/setup/old/tables_current.inc.php b/resources/setup/tables_current.inc.php similarity index 92% rename from resources/setup/old/tables_current.inc.php rename to resources/setup/tables_current.inc.php index 764b5e29e5..a5823f1e61 100755 --- a/resources/setup/old/tables_current.inc.php +++ b/resources/setup/tables_current.inc.php @@ -20,8 +20,8 @@ 'name' => array('type' => 'varchar','precision' => '100'), 'short_description' => array('type' => 'varchar','precision' => '100'), 'cat_id' => array('type' => 'int','precision' => '11','nullable' => False), - 'quantity' => array('type' => 'varchar','precision' => '11'), - 'useable' => array('type' => 'varchar','precision' => '11'), + 'quantity' => array('type' => 'int','precision' => '11'), + 'useable' => array('type' => 'int','precision' => '11'), 'location' => array('type' => 'varchar','precision' => '100'), 'bookable' => array('type' => 'varchar','precision' => '1'), 'buyable' => array('type' => 'varchar','precision' => '1'),