From 0e54aaf345ccdf6f2f5e9c728d2a523e22c977de Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 25 Sep 2018 11:40:22 +0200
Subject: [PATCH] Merge pull request #49 from tompsonx/master

* Resources: correct the field name from res_owner to res_creator.
---
 resources/inc/class.resources_bo.inc.php | 2 +-
 resources/templates/default/edit.xet     | 2 +-
 resources/templates/mobile/edit.xet      | 2 +-
 resources/templates/mobile/view.xet      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php
index dc5b2cb671..84f77c3d43 100755
--- a/resources/inc/class.resources_bo.inc.php
+++ b/resources/inc/class.resources_bo.inc.php
@@ -320,7 +320,7 @@ class resources_bo
 		// we need an id to save pictures and make links...
 		if(!$resource['res_id'])
 		{
-			$resource['res_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			$resource['res_creator'] = $GLOBALS['egw_info']['user']['account_id'];
 			$resource['res_created'] = Api\DateTime::server2user(time(),'ts');
 			$resource['res_id'] = $this->so->save($resource);
 		}
diff --git a/resources/templates/default/edit.xet b/resources/templates/default/edit.xet
index 28778df467..f0ffc40a2e 100644
--- a/resources/templates/default/edit.xet
+++ b/resources/templates/default/edit.xet
@@ -181,7 +181,7 @@
 					<description value="Created by"/>
 					<hbox>
 						<menulist>
-							<menupopup type="select-account" id="res_owner" readonly="true"/>
+							<menupopup type="select-account" id="res_creator" readonly="true"/>
 						</menulist>
 						<date-time id="res_created" readonly="true" align="right"/>
 					</hbox>
diff --git a/resources/templates/mobile/edit.xet b/resources/templates/mobile/edit.xet
index 1164e4df56..1b77e9461c 100644
--- a/resources/templates/mobile/edit.xet
+++ b/resources/templates/mobile/edit.xet
@@ -117,7 +117,7 @@
 					<description value="Created by"/>
 					<hbox>
 						<menulist>
-							<menupopup type="select-account" id="res_owner" readonly="true"/>
+							<menupopup type="select-account" id="res_creator" readonly="true"/>
 						</menulist>
 						<date-time id="res_created" readonly="true" align="right"/>
 					</hbox>
diff --git a/resources/templates/mobile/view.xet b/resources/templates/mobile/view.xet
index 19e01af973..b06be18f6e 100644
--- a/resources/templates/mobile/view.xet
+++ b/resources/templates/mobile/view.xet
@@ -31,7 +31,7 @@
 					<description value="Created by"/>
 					<hbox>
 						<menulist>
-							<menupopup type="select-account" id="res_owner" readonly="true"/>
+							<menupopup type="select-account" id="res_creator" readonly="true"/>
 						</menulist>
 						<date-time id="res_created" readonly="true" align="right"/>
 					</hbox>