From 9c3945a4cc72ceb98bcb240c50c37cbc98a2be58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Fri, 25 Feb 2005 08:55:37 +0000 Subject: [PATCH] work on links and accessories --- .../class.admin_prefs_sidebox_hooks.inc.php | 23 +++---- resources/inc/class.bo_resources.inc.php | 27 +++++++- resources/setup/etemplates.inc.php | 4 +- resources/setup/etemplates.old.inc.php | 10 +-- resources/setup/setup.inc.php | 5 +- resources/setup/setup.old.inc.php | 11 ++-- resources/setup/tables_current.inc.php | 4 +- resources/setup/tables_current.old.inc.php | 10 +-- resources/setup/tables_update.inc.php | 62 +++++++++++++++++++ resources/setup/tables_update.old.inc.php | 41 ++++++++++++ 10 files changed, 163 insertions(+), 34 deletions(-) diff --git a/resources/inc/class.admin_prefs_sidebox_hooks.inc.php b/resources/inc/class.admin_prefs_sidebox_hooks.inc.php index c93d6ee132..66ef4cb04a 100644 --- a/resources/inc/class.admin_prefs_sidebox_hooks.inc.php +++ b/resources/inc/class.admin_prefs_sidebox_hooks.inc.php @@ -73,19 +73,16 @@ class admin_prefs_sidebox_hooks display_sidebox($appname,lang('Admin'),$file); } } - - if ($location == 'search_link') - { - $app_register = array( - 'resources' => array( - 'query' => 'resources_query', - 'title' => 'resources_title', - 'view' => array( - 'menuaction' => 'resources.ui_resources.view' - ), - 'view_id' => 'id' - )); - } + } + function search_link($args) + { + $appname = 'resources'; + return array('resources' => array( + 'query' => 'resources.ui_resources.link_query', + 'title' => 'resources_title', + 'view' => array('menuaction' => 'resources.ui_resources.view'), + 'view_id' => 'id' + )); } } diff --git a/resources/inc/class.bo_resources.inc.php b/resources/inc/class.bo_resources.inc.php index 4e32d70f2a..c63d38607a 100755 --- a/resources/inc/class.bo_resources.inc.php +++ b/resources/inc/class.bo_resources.inc.php @@ -197,7 +197,32 @@ class bo_resources } return $acc_list; } - + + /*! + @function link_query + @syntax link_query( $pattern ) + @author ralfbecker + @abstract query infolog for entries matching $pattern + */ + function link_query( $pattern ) + {print_r($pattern); + $query = array( + 'search' => $pattern, + 'start' => 0, + 'subs' => true, + ); + $ids = $this->search($query); + $content = array(); + if (is_array($ids)) + { + foreach($ids as $id => $info ) + { + $content[$id] = $this->link_title($id); + } + } + return $content; + } + /*! @function save_picture @abstract resizes and saves an pictures in vfs diff --git a/resources/setup/etemplates.inc.php b/resources/setup/etemplates.inc.php index d6db73def2..abc3adbf31 100644 --- a/resources/setup/etemplates.inc.php +++ b/resources/setup/etemplates.inc.php @@ -1,5 +1,5 @@ 'resources.edit_pictures','template' => '','lang $templ_data[] = array('name' => 'resources.edit_tabs','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"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:5:{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:6:"needed";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:6:"select";s:4:"size";s:10:"select one";s:5:"label";s:8:"Category";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"cat_id";s:6:"needed";s:1:"1";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:54:"General|Description|Picture|Accessories|Links|Calendar";s:4:"name";s:48:"general|page|pictures|accessories|links|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";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1109155739',); -$templ_data[] = array('name' => 'resources.edit_tabs.accessories','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:42:"Accessory only! Don\'t show in master list.";s:4:"name";s:14:"accessory_only";}i:1;a:3:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:8:"groupbox";s:5:"label";s:12:"Accessories:";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:6:"select";s:4:"size";s:2:"10";s:4:"name";s:8:"acc_list";s:7:"no_lang";s:1:"1";}}}}','size' => '','style' => '','modified' => '1109151621',); - $templ_data[] = array('name' => 'resources.edit_tabs.general','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"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?";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1093597682',); $templ_data[] = array('name' => 'resources.edit_tabs.links','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:6:{s:1:"A";s:3:"100";s:2:"h4";s:3:"164";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1109248913',); diff --git a/resources/setup/etemplates.old.inc.php b/resources/setup/etemplates.old.inc.php index 9a50a423fa..d6db73def2 100755 --- a/resources/setup/etemplates.old.inc.php +++ b/resources/setup/etemplates.old.inc.php @@ -1,5 +1,5 @@ 'resources.edit_buttons','template' => '','lang' $templ_data[] = array('name' => 'resources.edit_pictures','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c1";s:3:"nmr";s:2:"c2";s:3:"nmr";s:2:"c3";s:3:"nmr";}i:1;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:26:"Use general resources icon";s:5:"align";s:5:"right";}s:1:"B";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"gen_src";s:4:"name";s:11:"picture_src";}s:1:"C";a:3:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"gen_src_list";}}i:2;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:23:"Use the category\'s icon";s:5:"align";s:5:"right";}s:1:"B";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"cat_src";s:4:"name";s:11:"picture_src";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:15:"Use own picture";s:5:"align";s:5:"right";}s:1:"B";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"own_src";s:4:"name";s:11:"picture_src";}s:1:"C";a:2:{s:4:"type";s:4:"file";s:4:"name";s:8:"own_file";}}}s:4:"rows";i:3;s:4:"cols";i:3;}}','size' => '','style' => '','modified' => '1108638846',); -$templ_data[] = array('name' => 'resources.edit_tabs','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"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:7:{s:4:"type";s:6:"select";s:4:"size";s:10:"select one";s:5:"label";s:8:"Category";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"cat_id";s:6:"needed";s:1:"1";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:48:"General|Description|Picture|Accessories|Calendar";s:4:"name";s:42:"general|page|pictures|accessories|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";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1109155739',); +$templ_data[] = array('name' => 'resources.edit_tabs','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"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:5:{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:6:"needed";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:6:"select";s:4:"size";s:10:"select one";s:5:"label";s:8:"Category";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"cat_id";s:6:"needed";s:1:"1";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:54:"General|Description|Picture|Accessories|Links|Calendar";s:4:"name";s:48:"general|page|pictures|accessories|links|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";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1109155739',); -$templ_data[] = array('name' => 'resources.edit_tabs.accessories','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:42:"Accessory only! Don\'t show in master list.";s:4:"name";s:8:"acc_only";}i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:8:"groupbox";s:5:"label";s:12:"Accessories:";s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:6:"select";s:4:"size";s:2:"10";s:4:"name";s:8:"acc_list";}}i:2;a:4:{s:4:"type";s:8:"groupbox";s:5:"label";s:10:"Relatives:";s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:6:"select";s:4:"size";s:2:"10";s:4:"name";s:8:"rel_list";}}}}','size' => '','style' => '','modified' => '1109151621',); +$templ_data[] = array('name' => 'resources.edit_tabs.accessories','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:2:{i:0;a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:42:"Accessory only! Don\'t show in master list.";s:4:"name";s:14:"accessory_only";}i:1;a:3:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:8:"groupbox";s:5:"label";s:12:"Accessories:";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:6:"select";s:4:"size";s:2:"10";s:4:"name";s:8:"acc_list";s:7:"no_lang";s:1:"1";}}}}','size' => '','style' => '','modified' => '1109151621',); $templ_data[] = array('name' => 'resources.edit_tabs.general','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"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?";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1093597682',); +$templ_data[] = array('name' => 'resources.edit_tabs.links','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:6:{s:1:"A";s:3:"100";s:2:"h4";s:3:"164";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1109248913',); + $templ_data[] = array('name' => 'resources.edit_tabs.page','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"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";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1093599237',); $templ_data[] = array('name' => 'resources.edit_tabs.pictures','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:16:"resource_picture";}s:1:"B";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"2";s:5:"label";s:14:"picture source";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:2:{s:4:"type";s:8:"template";s:4:"name";s:23:"resources.edit_pictures";}}}}s:4:"rows";i:1;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1108543308',); $templ_data[] = array('name' => 'resources.show','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:1:"A";s:4:"100%";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:19:"resources.show.rows";s:7:"no_lang";s:1:"1";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";}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1108479422',); -$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:1:"C";s:2:"3%";s:1:"F";s:2:"1%";s:1:"G";s:2:"1%";s:1:"H";s:2:"1%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";}i:1;a:8:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;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:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"align";s:5:"right";}s:1:"H";a:3:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"align";s:6:"center";}}i:2;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;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:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;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]";}i:2;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:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;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";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"delete.gif";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";}}s:1:"H";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:6:"center";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:8:"checkbox";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1108922292',); +$templ_data[] = array('name' => 'resources.show.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:1:"C";s:2:"3%";s:1:"F";s:2:"1%";s:1:"G";s:2:"1%";s:1:"H";s:2:"1%";s:2:"c1";s:3:"nmh";s:2:"c2";s:7:"nmr,top";}i:1;a:8:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}i:2;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:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Useable";s:4:"name";s:7:"useable";s:4:"help";s:36:"How many of this resource are usable";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:8:"quantity";s:4:"help";s:32:"How many of this resource exists";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Administrator";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Location";s:4:"name";s:8:"location";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Storage Inforation";}}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"align";s:5:"right";}s:1:"H";a:3:{s:4:"type";s:6:"button";s:4:"size";s:9:"check.png";s:5:"align";s:6:"center";}}i:2;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:5:"align";s:6:"center";s:4:"name";s:21:"${row}[picture_thumb]";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";}i:2;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:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;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]";}i:2;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:16:"${row}[quantity]";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;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";}i:2;a:4:{s:4:"type";s:14:"select-account";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[admin]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";}i:2;a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:12:"bookable.gif";s:5:"label";s:18:"Book this resource";s:5:"align";s:6:"center";s:4:"name";s:23:"bookable[$row_cont[id]]";s:4:"help";s:18:"Book this resource";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"buyable.gif";s:5:"label";s:17:"Buy this resource";s:5:"align";s:6:"center";s:4:"name";s:22:"buyable[$row_cont[id]]";s:4:"help";s:17:"Buy this resource";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:5:"align";s:6:"center";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:61:"return confirm(\'Do you really want do delte this resource?\');";s:4:"size";s:10:"delete.gif";}}s:1:"H";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:4:"View";s:5:"align";s:6:"center";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this entry";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:8:"checkbox";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1108922292',); diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php index d2de1c91f9..f2a7c9101d 100755 --- a/resources/setup/setup.inc.php +++ b/resources/setup/setup.inc.php @@ -15,7 +15,7 @@ $setup_info['resources']['name'] = 'resources'; $setup_info['resources']['title'] = 'resources'; - $setup_info['resources']['version'] = '0.0.1.016'; + $setup_info['resources']['version'] = '0.0.1.017'; $setup_info['resources']['app_order'] = 1; $setup_info['resources']['tables'] = array('egw_resources'); $setup_info['resources']['enable'] = 1; @@ -32,7 +32,7 @@ $setup_info['resources']['hooks']['preferences'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; $setup_info['resources']['hooks']['admin'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; $setup_info['resources']['hooks']['sidebox_menu'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; - $setup_info['resources']['hooks']['search_link'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; + $setup_info['resources']['hooks']['search_link'] = 'resources.admin_prefs_sidebox_hooks.search_link'; // $setup_info['resources']['hooks'][] = 'home'; // $setup_info['resources']['hooks'][] = 'settings'; @@ -57,3 +57,4 @@ + diff --git a/resources/setup/setup.old.inc.php b/resources/setup/setup.old.inc.php index b2c35dc419..48594bcbd5 100755 --- a/resources/setup/setup.old.inc.php +++ b/resources/setup/setup.old.inc.php @@ -15,7 +15,7 @@ $setup_info['resources']['name'] = 'resources'; $setup_info['resources']['title'] = 'resources'; - $setup_info['resources']['version'] = '0.0.1.015'; + $setup_info['resources']['version'] = '0.0.1.016'; $setup_info['resources']['app_order'] = 1; $setup_info['resources']['tables'] = array('egw_resources'); $setup_info['resources']['enable'] = 1; @@ -32,11 +32,9 @@ $setup_info['resources']['hooks']['preferences'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; $setup_info['resources']['hooks']['admin'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; $setup_info['resources']['hooks']['sidebox_menu'] = 'resources.admin_prefs_sidebox_hooks.all_hooks'; -// $setup_info['resources']['hooks'][] = 'admin'; + $setup_info['resources']['hooks']['search_link'] = 'resources.admin_prefs_sidebox_hooks.search_link'; // $setup_info['resources']['hooks'][] = 'home'; -// $setup_info['resources']['hooks'][] = 'sidebox_menu'; // $setup_info['resources']['hooks'][] = 'settings'; -// $setup_info['resources']['hooks'][] = 'preferences' $setup_info['resources']['depends'][] = array( 'appname' => 'phpgwapi', @@ -46,6 +44,11 @@ 'appname' => 'etemplate', 'versions' => Array('1.0.0') ); + $setup_info['resources']['depends'][] = array( // cause of the link class + 'appname' => 'infolog', + 'versions' => Array('1.0.0') + ); + diff --git a/resources/setup/tables_current.inc.php b/resources/setup/tables_current.inc.php index 60ceffb557..0292236295 100755 --- a/resources/setup/tables_current.inc.php +++ b/resources/setup/tables_current.inc.php @@ -27,10 +27,8 @@ 'buyable' => array('type' => 'varchar','precision' => '1'), 'prize' => array('type' => 'varchar','precision' => '200'), 'long_description' => array('type' => 'longtext'), - 'accessories' => array('type' => 'varchar','precision' => '100'), 'picture_src' => array('type' => 'varchar','precision' => '20'), - 'accessory_only' => array('type' => 'varchar','precision' => '1','default' => '0'), - 'relatives' => array('type' => 'varchar','precision' => '100') + 'accessoriy_of' => array('type' => 'int','precision' => '11','default' => '-1') ), 'pk' => array('id'), 'fk' => array(), diff --git a/resources/setup/tables_current.old.inc.php b/resources/setup/tables_current.old.inc.php index d90f2e4913..60ceffb557 100755 --- a/resources/setup/tables_current.old.inc.php +++ b/resources/setup/tables_current.old.inc.php @@ -20,15 +20,17 @@ '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' => 'int','precision' => '11'), - 'useable' => array('type' => 'int','precision' => '11'), + 'quantity' => array('type' => 'int','precision' => '11','default' => '1'), + 'useable' => array('type' => 'int','precision' => '11','default' => '1'), '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'), - 'accessories' => array('type' => 'varchar','precision' => '50'), - 'picture_src' => array('type' => 'varchar','precision' => '20') + 'accessories' => array('type' => 'varchar','precision' => '100'), + 'picture_src' => array('type' => 'varchar','precision' => '20'), + 'accessory_only' => array('type' => 'varchar','precision' => '1','default' => '0'), + 'relatives' => array('type' => 'varchar','precision' => '100') ), 'pk' => array('id'), 'fk' => array(), diff --git a/resources/setup/tables_update.inc.php b/resources/setup/tables_update.inc.php index b61c067fa1..5b356f3fe7 100755 --- a/resources/setup/tables_update.inc.php +++ b/resources/setup/tables_update.inc.php @@ -128,4 +128,66 @@ $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.016'; return $GLOBALS['setup_info']['resources']['currentver']; } + + + $test[] = '0.0.1.016'; + function resources_upgrade0_0_1_016() + { + $GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources','accessories','picture_src'); + $GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array( + 'fd' => array( + 'id' => array('type' => 'auto'), + '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' => 'int','precision' => '11','default' => '1'), + 'useable' => array('type' => 'int','precision' => '11','default' => '1'), + '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'), + 'accessories' => array('type' => 'varchar','precision' => '100'), + 'picture_src' => array('type' => 'varchar','precision' => '20'), + 'relatives' => array('type' => 'varchar','precision' => '100') + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + ),'accessory_only'); + $GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array( + 'fd' => array( + 'id' => array('type' => 'auto'), + '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' => 'int','precision' => '11','default' => '1'), + 'useable' => array('type' => 'int','precision' => '11','default' => '1'), + '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'), + 'accessories' => array('type' => 'varchar','precision' => '100'), + 'picture_src' => array('type' => 'varchar','precision' => '20') + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + ),'relatives'); + $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture_src',array( + 'type' => 'varchar', + 'precision' => '20' + )); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','accessoriy_of',array( + 'type' => 'int', + 'precision' => '11', + 'default' => '-1' + )); + + $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.017'; + return $GLOBALS['setup_info']['resources']['currentver']; + } ?> diff --git a/resources/setup/tables_update.old.inc.php b/resources/setup/tables_update.old.inc.php index 6236ce4ef0..b61c067fa1 100755 --- a/resources/setup/tables_update.old.inc.php +++ b/resources/setup/tables_update.old.inc.php @@ -87,4 +87,45 @@ $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.014'; return $GLOBALS['setup_info']['resources']['currentver']; } + + + $test[] = '0.0.1.014'; + function resources_upgrade0_0_1_014() + { + $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','quantity',array( + 'type' => 'int', + 'precision' => '11', + 'default' => '1' + )); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','useable',array( + 'type' => 'int', + 'precision' => '11', + 'default' => '1' + )); + + $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.015'; + return $GLOBALS['setup_info']['resources']['currentver']; + } + + + $test[] = '0.0.1.015'; + function resources_upgrade0_0_1_015() + { + $GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','accessories',array( + 'type' => 'varchar', + 'precision' => '100' + )); + $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessory_only',array( + 'type' => 'varchar', + 'precision' => '1', + 'default' => '0' + )); + $GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','relatives',array( + 'type' => 'varchar', + 'precision' => '100' + )); + + $GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.016'; + return $GLOBALS['setup_info']['resources']['currentver']; + } ?>