From 16f9f37576ac327bffe5260454e6b443acae18e6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 14 Apr 2011 17:05:16 +0000
Subject: [PATCH] Add storage_info to list of fields for import/export

---
 .../class.resources_wizard_export_csv.inc.php |  1 +
 .../class.resources_wizard_import_csv.inc.php | 25 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/resources/inc/class.resources_wizard_export_csv.inc.php b/resources/inc/class.resources_wizard_export_csv.inc.php
index 6f599e2c37..f3fffacb15 100644
--- a/resources/inc/class.resources_wizard_export_csv.inc.php
+++ b/resources/inc/class.resources_wizard_export_csv.inc.php
@@ -24,6 +24,7 @@ class resources_wizard_export_csv extends importexport_wizard_basic_export_csv
 			'quantity'	=> lang('Quantity'),
 			'useable'	=> lang('Useable'),
 			'location'	=> lang('Location'),
+			'storage_info'	=> lang('Storage'),
 			'bookable'	=> lang('Bookable'),
 			'buyable'	=> lang('Buyable'),
 			'prize'		=> lang('Prize'),
diff --git a/resources/inc/class.resources_wizard_import_csv.inc.php b/resources/inc/class.resources_wizard_import_csv.inc.php
index e5c3cefb36..1c3617c103 100644
--- a/resources/inc/class.resources_wizard_import_csv.inc.php
+++ b/resources/inc/class.resources_wizard_import_csv.inc.php
@@ -27,18 +27,19 @@ class resources_wizard_import_csv extends importexport_wizard_basic_import_csv
 		// Field mapping
 		$export = new resources_wizard_export_csv();
 		$this->mapping_fields = array(
-                        'res_id'        => lang('Resource ID'),
-                        'name'          => lang('name'),
-                        'short_description'     => lang('short description'),
-                        'cat_id'        => lang('Category'),
-                        'quantity'      => lang('Quantity'),
-                        'useable'       => lang('Useable'),
-                        'location'      => lang('Location'),
-                        'bookable'      => lang('Bookable'),
-                        'buyable'       => lang('Buyable'),
-                        'prize'         => lang('Prize'),
-                        'long_description'      => lang('Long description'),
-                        'inventory_number'      => lang('inventory number'),
+			'res_id'	=> lang('Resource ID'),
+			'name'		=> lang('name'),
+			'short_description'     => lang('short description'),
+			'cat_id'	=> lang('Category'),
+			'quantity'	=> lang('Quantity'),
+			'useable'	=> lang('Useable'),
+			'location'	=> lang('Location'),
+			'storage_info'	=> lang('Storage'),
+			'bookable'	=> lang('Bookable'),
+			'buyable'	=> lang('Buyable'),
+			'prize'		=> lang('Prize'),
+			'long_description'      => lang('Long description'),
+			'inventory_number'      => lang('inventory number'),
                 );
 
 		$custom = config::get_customfields('resources', true);