[Fmsystem-commits] [7559] rental: configurable contract_future_info and contract_furnished_status

[Sigurd Nes]

Revision: 7559
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7559
Author:   sigurdne
Date:     2011-09-06 12:50:59 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
rental: configurable contract_future_info and contract_furnished_status

Modified Paths:
--------------
    trunk/rental/templates/base/composite_list_partial.php
    trunk/rental/templates/base/config.tpl

Modified: trunk/rental/templates/base/composite_list_partial.php
===================================================================
--- trunk/rental/templates/base/composite_list_partial.php      2011-09-06 
12:22:15 UTC (rev 7558)
+++ trunk/rental/templates/base/composite_list_partial.php      2011-09-06 
12:50:59 UTC (rev 7559)
@@ -1,5 +1,9 @@
+<?php
+       $config = CreateObject('phpgwapi.config','rental');
+       $config->read();
+?>
+
 <script type="text/javascript">
-
 function checkAvailabitily()
 { 
        if(document.forms[0].availability_date_to.value == '')
@@ -53,17 +57,31 @@
                        label: "<?php echo lang('status') ?>",
                    sortable: true
                },
+<?php
+       if(isset($config->config_data['contract_future_info']) && 
$config->config_data['contract_future_info'])
+       {
+?>
+                       {
+                               key: "contracts",
+                               label: "<?php echo lang('contract_future_info') 
?>",
+                           sortable: false
+                       },
+<?php
+       }
+       if(isset($config->config_data['contract_furnished_status']) && 
$config->config_data['contract_furnished_status'])
+       {
+
+?>
+
+                       {
+                               key: "furnished_status",
+                               label: "<?php echo lang('furnish_type') ?>",
+                           sortable: false
+                       },
+<?php
+       }
+?>
                {
-                       key: "contracts",
-                       label: "<?php echo lang('contract_future_info') ?>",
-                   sortable: false
-               },
-               {
-                       key: "furnished_status",
-                       label: "<?php echo lang('furnish_type') ?>",
-                   sortable: false
-               },
-               {
                        key: "actions",
                        hidden: true
                },

Modified: trunk/rental/templates/base/config.tpl
===================================================================
--- trunk/rental/templates/base/config.tpl      2011-09-06 12:22:15 UTC (rev 
7558)
+++ trunk/rental/templates/base/config.tpl      2011-09-06 12:50:59 UTC (rev 
7559)
@@ -81,7 +81,25 @@
                         </select>
                        </td>
                </tr>
+               <tr class="row_on">
+                       <td>{lang_contract_future_info}:</td>
+                       <td>
+                               <select 
name="newsettings[contract_future_info]">
+                                       <option value="" 
{selected_contract_future_info_}>NO</option>
+                                       <option value="1" 
{selected_contract_future_info_1}>YES</option>
+                               </select>
+                       </td>
+               </tr>
                <tr class="row_off">
+                       <td>{lang_contract_furnished_status}:</td>
+                       <td>
+                               <select 
name="newsettings[contract_furnished_status]">
+                                       <option value="" 
{selected_contract_furnished_status_}>NO</option>
+                                       <option value="1" 
{selected_contract_furnished_status_1}>YES</option>
+                               </select>
+                       </td>
+               </tr>
+               <tr class="row_off">
                        <td>{lang_use_fellesdata}:</td>
                        <td>
                                <select name="newsettings[use_fellesdata]">