extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 09:28:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix resources duplication of 'accessory of' menulist

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-20 18:18:55 +00:00
parent 01773135ea
commit a9416b2ce9
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/inc/class.resources_ui.inc.php
View File

@ -526,7 +526,6 @@ class resources_ui
$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of; $content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
} }
$search_options = array('accessory_of' => -1); $search_options = array('accessory_of' => -1);
$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
$content['history'] = array( $content['history'] = array(
'id' => $res_id, 'id' => $res_id,
@ -536,6 +535,8 @@ class resources_ui
'long_description' => 'html' 'long_description' => 'html'
) )
); );
$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
if($res_id) unset($sel_options['accessory_of'][$res_id]); if($res_id) unset($sel_options['accessory_of'][$res_id]);
// $content['general|page|pictures|links'] = 'resources.edit_tabs.page'; //debug // $content['general|page|pictures|links'] = 'resources.edit_tabs.page'; //debug

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

@ -12,52 +12,44 @@
<rows> <rows>
<row> <row>
<description value="Description (short)"/> <description value="Description (short)"/>
<textbox statustext="Short description of resource" id="short_description" size="50" maxlength="100"/> <textbox statustext="Short description of resource" id="short_description" size="50" maxlength="100" span="2"/>
<description/>
<description value="Short description of resource"/> <description value="Short description of resource"/>
</row> </row>
<row> <row>
<description value="Location"/> <description value="Location"/>
<textbox statustext="Location of resource" id="location" size="50" maxlength="100"/> <textbox statustext="Location of resource" id="location" size="50" maxlength="100" span="2"/>
<description/>
<description value="Where to find this resource?"/> <description value="Where to find this resource?"/>
</row> </row>
<row> <row>
<description value="Storage information"/> <description value="Storage information"/>
<textbox statustext="Information about storage" id="storage_info" size="50" maxlength="100"/> <textbox statustext="Information about storage" id="storage_info" size="50" maxlength="100" span="2"/>
<description/>
<description value="Information about storage"/> <description value="Information about storage"/>
</row> </row>
<row> <row>
<description value="Quantity"/> <description value="Quantity"/>
<textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10"/> <textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10" span="2"/>
<description/>
<description value="Quantity of resource"/> <description value="Quantity of resource"/>
</row> </row>
<row> <row>
<description value="Useable"/> <description value="Useable"/>
<textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10"/> <textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" span="2"/>
<description/>
<description value="How many of the resources are useable?"/> <description value="How many of the resources are useable?"/>
</row> </row>
<row> <row>
<description value="Bookable"/> <description value="Bookable"/>
<checkbox statustext="Is resource bookable?" id="bookable"/> <checkbox statustext="Is resource bookable?" id="bookable" span="2"/>
<description/>
<description value="Is this resource bookable?"/> <description value="Is this resource bookable?"/>
</row> </row>
<row> <row>
<description value="Accessory of"/> <description value="Accessory sdfsdfof"/>
<menulist> <menulist>
<menupopup id="accessory_of" no_lang="1"/> <menupopup id="accessory_of" no_lang="1" span="2"/>
</menulist> </menulist>
<description/>
<description id="accessory_label"/> <description id="accessory_label"/>
</row> </row>
<row> <row>
<description disabled="true" value="Buyable"/> <description disabled="true" value="Buyable"/>
<checkbox disabled="true" statustext="Is resource buyable?" id="buyable"/> <checkbox disabled="true" statustext="Is resource buyable?" id="buyable" span="2"/>
<description/>
<description disabled="true" value="Is this resource buyable?"/> <description disabled="true" value="Is this resource buyable?"/>
</row> </row>
<row height="100%"> <row height="100%">