[Fmsystem-commits] [16757] More on Eventplanner

[sigurdne]

Revision: 16757
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16757
Author:   sigurdne
Date:     2017-05-19 09:28:37 -0400 (Fri, 19 May 2017)
Log Message:
-----------
More on Eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.soapplication.inc.php
    trunk/eventplanner/inc/model/class.application.inc.php
    trunk/phpgwapi/inc/class.bocommon.inc.php

Modified: trunk/eventplanner/inc/class.soapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.soapplication.inc.php  2017-05-19 07:31:53 UTC 
(rev 16756)
+++ trunk/eventplanner/inc/class.soapplication.inc.php  2017-05-19 13:28:37 UTC 
(rev 16757)
@@ -160,7 +160,7 @@
                        {
                                $new_value = $object->$field;
                                $old_value = $original[$field];
-                               if (!empty($params['history']) && ($new_value 
!= $old_value))
+                               if (!empty($params['history']) && ($new_value 
!= $old_value) && ($params['action'] & PHPGW_ACL_EDIT))
                                {
                                        $label = !empty($params['label']) ? 
lang($params['label']) : $field;
                                        switch ($field)

Modified: trunk/eventplanner/inc/model/class.application.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.application.inc.php      2017-05-19 
07:31:53 UTC (rev 16756)
+++ trunk/eventplanner/inc/model/class.application.inc.php      2017-05-19 
13:28:37 UTC (rev 16757)
@@ -139,7 +139,7 @@
                                        'type' => 'int',
                                        'label' => 'category',
                                        'history' => true),
-                               'num_granted_events' => array('action'=> 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                               'num_granted_events' => array('action'=> 0,
                                        'type' => 'int',
                                        'label' => 'number of granted events',
                                        'history' => true
@@ -181,10 +181,11 @@
                                        'sortable' => false,
                                        'required' => true,
                                        ),
-                               'summary' => array('action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
+                               'summary' => array('action'=> 0,
                                        'type' => 'html',
                                        'label' => 'summary',
                                        'sortable' => false,
+                                       'query' => true,
                                        ),
                                'remark' => array('action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
                                        'type' => 'string',
@@ -358,6 +359,11 @@
                        if($currentapp == 'eventplanner')
                        {
                                $backend_fields = array(
+                                       'num_granted_events' => 
array('action'=> PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                               'type' => 'int',
+                                               'label' => 'number of granted 
events',
+                                               'history' => true
+                                       ),
                                        'case_officer_id' => array('action'=> 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
                                                'type' => 'int',
                                                'required' => true,
@@ -386,6 +392,11 @@
                                                'label' => 'status',
                                                'history' => true
                                                ),
+                                       'summary' => array('action'=> 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                               'type' => 'html',
+                                               'label' => 'summary',
+                                               'sortable' => false,
+                                       ),
                                        'comments' => array(
                                                'action'=> PHPGW_ACL_ADD | 
PHPGW_ACL_EDIT,
                                                'type' => 'string',

Modified: trunk/phpgwapi/inc/class.bocommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.bocommon.inc.php   2017-05-19 07:31:53 UTC (rev 
16756)
+++ trunk/phpgwapi/inc/class.bocommon.inc.php   2017-05-19 13:28:37 UTC (rev 
16757)
@@ -70,7 +70,7 @@
                                        $params['filters'][$field] = 
phpgw::get_var("filter_$field", $_params['type']);
                                }
 
-                               if($field == $order)
+                               if($field == $sort && $_params['sortable'])
                                {
                                        $params['sort'] = $field;
                                }