[Fmsystem-commits] [14296] more on controller

[Sigurd Nes]

Revision: 14296
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14296
Author:   sigurdne
Date:     2015-11-08 14:56:34 +0000 (Sun, 08 Nov 2015)
Log Message:
-----------
more on controller

Modified Paths:
--------------
    trunk/controller/inc/class.uicomponent.inc.php
    trunk/controller/templates/base/component.xsl

Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php      2015-11-08 14:27:10 UTC 
(rev 14295)
+++ trunk/controller/inc/class.uicomponent.inc.php      2015-11-08 14:56:34 UTC 
(rev 14296)
@@ -838,7 +838,7 @@
                        {
                                return array(
                                        'components' => null,
-                                       'summary' => 
$this->get_summary($values, $keep_only_assigned_to),
+                                       'summary' => 
$this->get_summary($values, $user_id),
                                        'location_filter' => $location_filter
                                );
                        }
@@ -1136,7 +1136,7 @@
                        return 
"{$repeat_type}<br/>{$link}<br/>{$assigned_to}<br/>{$time}";
                }
 
-               private function get_summary($data, $keep_only_assigned_to)
+               private function get_summary($data, $user_id)
                {
 
 
@@ -1185,7 +1185,7 @@
 
                                for ( $_month=1; $_month < 13; $_month++ )
                                {
-                                       if($keep_only_assigned_to && 
$keep_only_assigned_to != $entry[$_month]['info']['assigned_to'])
+                                       if($user_id && $user_id != 
$entry[$_month]['info']['assigned_to'])
                                        {
                                                continue;
                                        }

Modified: trunk/controller/templates/base/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl       2015-11-08 14:27:10 UTC 
(rev 14295)
+++ trunk/controller/templates/base/component.xsl       2015-11-08 14:56:34 UTC 
(rev 14296)
@@ -252,6 +252,7 @@
                {
                        $("#receipt").html('');
 
+                       var report_type = $("#report_type").val();
                        var user_id = $("#user_id").val();
                        var custom_frontend = 
$("[name='custom_frontend']").val();
 
@@ -288,6 +289,17 @@
                                $("[for='user_only']").show();
                        }
 
+                       if(report_type == 'summary')
+                       {
+                               $("[name='user_only']").hide();
+                               $("[for='user_only']").hide();
+                       }
+                       else
+                       {
+                               $("[name='user_only']").show();
+                               $("[for='user_only']").show();
+                       }
+
                        var requestUrl = $("#queryForm").attr("action");
                        requestUrl += '&phpgw_return_as=json' + "&" + 
$("#queryForm").serialize();