[Fmsystem-commits] [15713] Stable: Merge 15694:15712 from trunk

[sigurdne]

Revision: 15713
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15713
Author:   sigurdne
Date:     2016-09-21 11:44:50 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
Stable: Merge 15694:15712 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php
    branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
    branches/Version-2_0-branch/property/inc/class.bogallery.inc.php
    branches/Version-2_0-branch/rental/inc/model/class.application.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712

Modified: branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php    
2016-09-21 11:40:12 UTC (rev 15712)
+++ branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php    
2016-09-21 11:44:50 UTC (rev 15713)
@@ -140,7 +140,7 @@
                                $resource = extract_values($_POST, 
$this->fields);
                                $resource['active'] = '1';
                                $building_id = phpgw::get_var('building_id', 
'int');
-                               $resource['buildings'] = array('building_id' => 
$building_id);
+                               $resource['buildings'][] = $building_id;
                                $building = 
$this->sobuilding->read_single($building_id);
                                $resource['activity_id'] = 
$building['activity_id'];
 

Modified: 
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl    
2016-09-21 11:40:12 UTC (rev 15712)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl    
2016-09-21 11:44:50 UTC (rev 15713)
@@ -328,6 +328,9 @@
                                                                                
        <xsl:attribute name="class">
                                                                                
                <xsl:value-of select="phpgw:conditional(not(class), '', 
class)"/>
                                                                                
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="checked">
+                                                                               
                <xsl:value-of select="phpgw:conditional(not(checked), '', 
checked)"/>
+                                                                               
        </xsl:attribute>
                                                                                
</input>
                                                                        </td>
                                                                </xsl:otherwise>

Modified: branches/Version-2_0-branch/property/inc/class.bogallery.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bogallery.inc.php    
2016-09-21 11:40:12 UTC (rev 15712)
+++ branches/Version-2_0-branch/property/inc/class.bogallery.inc.php    
2016-09-21 11:44:50 UTC (rev 15713)
@@ -116,18 +116,6 @@
 
                public function read( $data = array() )
                {
-                       //$dry_run=''
-                       //$data = array()
-                       //$start_date   = 
phpgwapi_datetime::date_to_timestamp($this->start_date);
-                       //$end_date     = 
phpgwapi_datetime::date_to_timestamp($this->end_date);
-//                     $valid_locations = $this->get_gallery_location();
-//            //echo '<pre>'; print_r($valid_locations);echo '</pre>';
-//            array_unshift($data['valid_locations'],$valid_locations);
-//                     $values = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
-//                     'allrows'=>$this->allrows, 'location_id' => 
$this->location_id, 'user_id' => $this->user_id,
-//                     'mime_type' => $this->mime_type, 'start_date' => 
$start_date, 'end_date' => $end_date,
-//                     'cat_id' => $this->cat_id, 'valid_locations' => 
$valid_locations, 'dry_run'=>$dry_run));
-
                        $values = $this->so->read($data);
 
                        $img_types = array
@@ -150,8 +138,15 @@
                                $entry['img_id'] = '';
                                if (in_array($entry['mime_type'], $img_types))
                                {
-                                       $entry['img_id'] = "img-{$i}";
-                                       $i++;
+                                       $entry['img_id'] = $entry['id'];
+                                       $entry['file_name'] = $entry['name'];
+                                       $entry['img_url'] = 
$GLOBALS['phpgw']->link('/index.php', array(
+                                                       'menuaction' => 
'property.uigallery.view_file',
+                                                       'img_id' => 
$entry['img_id'],
+                                                       'file' => 
"{$entry['directory']}/{$entry['file_name']}"
+                                               )
+                                       );
+                                       $entry['thumbnail_flag'] = 'thumb=1';
                                }
 
                                $entry['date'] = 
$GLOBALS['phpgw']->common->show_date(strtotime($entry['created']), $dateformat);

Modified: branches/Version-2_0-branch/rental/inc/model/class.application.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.application.inc.php      
2016-09-21 11:40:12 UTC (rev 15712)
+++ branches/Version-2_0-branch/rental/inc/model/class.application.inc.php      
2016-09-21 11:44:50 UTC (rev 15713)
@@ -231,7 +231,7 @@
                                {
                                        
if(!property_exists('rental_application', $field))
                                        {
-                                          phpgwapi_cache::message_set("$field 
is missing from model-definition", 'error');
+                                          
phpgwapi_cache::message_set('$'."{$field}", 'error');
                                        }
 
                                }