extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49 from tompsonx/master

Browse Source 
* Resources: correct the field name from res_owner to res_creator.
This commit is contained in:
Hadi Nategh 2018-09-25 11:40:22 +02:00 committed by GitHub
commit c96f4ff5c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/inc/class.resources_bo.inc.php
View File

@ -320,7 +320,7 @@ class resources_bo
// we need an id to save pictures and make links... // we need an id to save pictures and make links...
if(!$resource['res_id']) 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_created'] = Api\DateTime::server2user(time(),'ts');
$resource['res_id'] = $this->so->save($resource); $resource['res_id'] = $this->so->save($resource);
} }

2
resources/templates/default/edit.xet
View File

@ -181,7 +181,7 @@
<description value="Created by"/> <description value="Created by"/>
<hbox> <hbox>
<menulist> <menulist>
<menupopup type="select-account" id="res_owner" readonly="true"/> <menupopup type="select-account" id="res_creator" readonly="true"/>
</menulist> </menulist>
<date-time id="res_created" readonly="true" align="right"/> <date-time id="res_created" readonly="true" align="right"/>
</hbox> </hbox>

2
resources/templates/mobile/edit.xet
View File

@ -117,7 +117,7 @@
<description value="Created by"/> <description value="Created by"/>
<hbox> <hbox>
<menulist> <menulist>
<menupopup type="select-account" id="res_owner" readonly="true"/> <menupopup type="select-account" id="res_creator" readonly="true"/>
</menulist> </menulist>
<date-time id="res_created" readonly="true" align="right"/> <date-time id="res_created" readonly="true" align="right"/>
</hbox> </hbox>

2
resources/templates/mobile/view.xet
View File

@ -31,7 +31,7 @@
<description value="Created by"/> <description value="Created by"/>
<hbox> <hbox>
<menulist> <menulist>
<menupopup type="select-account" id="res_owner" readonly="true"/> <menupopup type="select-account" id="res_creator" readonly="true"/>
</menulist> </menulist>
<date-time id="res_created" readonly="true" align="right"/> <date-time id="res_created" readonly="true" align="right"/>
</hbox> </hbox>