[Fmsystem-commits] [15720]

[saul . huanay]

Revision: 15720
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15720
Author:   psaul
Date:     2016-09-23 00:24:09 +0000 (Fri, 23 Sep 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/rental/inc/model/class.application.inc.php
    branches/dev-syncromind-2/rental/templates/base/rental_schedule.xsl

Modified: branches/dev-syncromind-2/rental/inc/model/class.application.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/model/class.application.inc.php        
2016-09-22 12:30:58 UTC (rev 15719)
+++ branches/dev-syncromind-2/rental/inc/model/class.application.inc.php        
2016-09-23 00:24:09 UTC (rev 15720)
@@ -44,6 +44,7 @@
                        $status,
                        $ecodimb_id,
                        $ecodimb_name,
+                       $composites,
                        $district_id,
                        $composite_type_id,
                        $date_start,
@@ -124,6 +125,13 @@
                                                'column' => 'descr'
                                                )
                                        ),
+                               'composites' => array('type' => 'string',
+                                       'manytomany' => array(
+                                               'table' => 
'rental_application_composite',
+                                               'key' => 'application_id',
+                                               'column' => 'composite_id'
+                                               )
+                                       ),
                                'district_id' => array('action'=> PHPGW_ACL_ADD 
| PHPGW_ACL_EDIT,
                                        'type' => 'int'),
                                'composite_type_id' => array('action'=> 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,

Modified: branches/dev-syncromind-2/rental/templates/base/rental_schedule.xsl
===================================================================
--- branches/dev-syncromind-2/rental/templates/base/rental_schedule.xsl 
2016-09-22 12:30:58 UTC (rev 15719)
+++ branches/dev-syncromind-2/rental/templates/base/rental_schedule.xsl 
2016-09-23 00:24:09 UTC (rev 15720)
@@ -140,7 +140,7 @@
                        <input type="text" id="txtSearchSchedule" 
class="searchSchedule" />
                </p>
                <div id="schedule_container"></div>
-               <p>
+               <p style="height: 50px; line-height: 50px;">
                        <label for="cboNObjects">Show</label>
                        <select name="cboNObjects" id="cboNObjects" 
class="searchSchedule">
                                <option selected="selected" 
value="15">15</option>