[Fmsystem-commits] [17082] more on eventplanner

[sigurdne]

Revision: 17082
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17082
Author:   sigurdne
Date:     2017-09-16 15:41:57 -0400 (Sat, 16 Sep 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uicustomer_report.inc.php
    trunk/eventplanner/setup/phpgw_no.lang
    trunk/eventplannerfrontend/inc/class.menu.inc.php

Modified: trunk/eventplanner/inc/class.uicustomer_report.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uicustomer_report.inc.php      2017-09-16 
19:02:40 UTC (rev 17081)
+++ trunk/eventplanner/inc/class.uicustomer_report.inc.php      2017-09-16 
19:41:57 UTC (rev 17082)
@@ -188,11 +188,14 @@
                                )
                        );
 
-                       $filters = $this->_get_filters();
+                       if($this->currentapp == 'eventplanner')
+                       {
+                               $filters = $this->_get_filters();
 
-                       foreach ($filters as $filter)
-                       {
-                               array_unshift($data['form']['toolbar']['item'], 
$filter);
+                               foreach ($filters as $filter)
+                               {
+                                       
array_unshift($data['form']['toolbar']['item'], $filter);
+                               }
                        }
 
                        $parameters = array(
@@ -331,7 +334,7 @@
                        
self::render_template_xsl(array('report','application_info', 
'datatable_inline', 'attributes_form'), array($mode => $data));
                }
 
-               
+
                public function save()
                {
                        parent::save();

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-09-16 19:02:40 UTC (rev 
17081)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-09-16 19:41:57 UTC (rev 
17082)
@@ -167,4 +167,5 @@
 vendor name    eventplanner    no      Artistnavn/utøver/gruppe
 sum    eventplanner    no      Sum
 active application year        eventplanner    no      Aktivt søknadsår
-my bookings    eventplanner    no      Mine bookinger
\ No newline at end of file
+my bookings    eventplanner    no      Mine bookinger
+My customer report     eventplanner    no      Mine tilbakemeldinger
\ No newline at end of file

Modified: trunk/eventplannerfrontend/inc/class.menu.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.menu.inc.php   2017-09-16 19:02:40 UTC 
(rev 17081)
+++ trunk/eventplannerfrontend/inc/class.menu.inc.php   2017-09-16 19:41:57 UTC 
(rev 17082)
@@ -145,6 +145,18 @@
                                                        'image' => 
array('customer', 'navbar'),
                                                )
                                        );
+                               $menus['navigation']['customer']['children'] = 
array(
+                                               'booking' => array(
+                                                       'text' => lang('my 
bookings'),
+                                                       'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
"eventplannerfrontend.uibooking.index")),
+                                                       'image' => 
array('customer', 'navbar'),
+                                               )
+                                       );
+                               
$menus['navigation']['customer']['children']['customer_report'] = array(
+                                                       'text' => lang('My 
customer report'),
+                                                       'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
"eventplannerfrontend.uicustomer_report.index")),
+                                                       'image' => 
array('customer_report', 'navbar'),
+                                       );
 
                        }