[Fmsystem-commits] [12455] property: add test for group membership

[Sigurd Nes]

Revision: 12455
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12455
Author:   sigurdne
Date:     2014-12-12 09:10:33 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
property: add test for group membership

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/custom/default/ticket_NLSH_validate.js
    trunk/property/templates/base/tts.xsl

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2014-12-11 23:19:07 UTC (rev 
12454)
+++ trunk/property/inc/class.uitts.inc.php      2014-12-12 09:10:33 UTC (rev 
12455)
@@ -2049,8 +2049,18 @@
                                
$GLOBALS['phpgw']->jqcal->add_listener('values_finnish_date');
                        }
 
+                       
+                       $membership = 
$GLOBALS['phpgw']->accounts->membership($this->account);
+                       $my_groups = array();
+                       foreach($membership as $group_id => $group)
+                       {
+                               $my_groups[$group_id] = $group->firstname;
+
+                       }
+
                        $data = array
                        (
+                                       'my_groups'                             
                => json_encode($my_groups),
                                        'custom_attributes'                     
        => array('attributes' => $values['attributes']),
                                        'lookup_functions'                      
        => isset($values['lookup_functions'])?$values['lookup_functions']:'',
                                        'contact_data'                          
        => $contact_data,
@@ -3345,8 +3355,17 @@
                                $year++;
                        }
 
+                       $membership = 
$GLOBALS['phpgw']->accounts->membership($this->account);
+                       $my_groups = array();
+                       foreach($membership as $group_id => $group)
+                       {
+                               $my_groups[$group_id] = $group->firstname;
+
+                       }
+
                        $data = array
-                               (
+                       (
+                                       'my_groups'                             
                => json_encode($my_groups),
                                        'custom_attributes'                     
        => array('attributes' => $ticket['attributes']),
                                        'lookup_functions'                      
        => isset($ticket['lookup_functions'])?$ticket['lookup_functions']:'',
                                        'send_response'                         
        => isset($this->bo->config->config_data['tts_send_response']) ? 
$this->bo->config->config_data['tts_send_response'] : '',

Modified: trunk/property/inc/custom/default/ticket_NLSH_validate.js
===================================================================
--- trunk/property/inc/custom/default/ticket_NLSH_validate.js   2014-12-11 
23:19:07 UTC (rev 12454)
+++ trunk/property/inc/custom/default/ticket_NLSH_validate.js   2014-12-12 
09:10:33 UTC (rev 12455)
@@ -20,8 +20,11 @@
                case '21': //Feilmelding
                case '74': // Garanti
                case '176': // title="Periodisk vedlikehold
-                       
document.getElementById('label_feiltyper').style.display = 'block';
-                       document.getElementById('id_feiltyper').style.display = 
'block';
+                       if(my_groups[15] ) // forvalter
+                       {
+                               
document.getElementById('label_feiltyper').style.display = 'block';
+                               
document.getElementById('id_feiltyper').style.display = 'block';
+                       }
                        break;
                default:
                        
document.getElementById('label_feiltyper').style.display = 'none';
@@ -43,9 +46,12 @@
                case '21': //Feilmelding
                case '74': // Garanti
                case '176': // title="Periodisk vedlikehold
-                       if (!feiltype_id && status_id == 'X')
+                       if(my_groups[15] ) // forvalter
                        {
-                               error = true;
+                               if (!feiltype_id && status_id == 'X')
+                               {
+                                       error = true;
+                               }
                        }
                        break;
                default:

Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2014-12-11 23:19:07 UTC (rev 
12454)
+++ trunk/property/templates/base/tts.xsl       2014-12-12 09:10:33 UTC (rev 
12455)
@@ -22,6 +22,9 @@
                <script type="text/javascript">
                        self.name="first_Window";
                        <xsl:value-of select="lookup_functions"/>
+
+                       var my_groups = <xsl:value-of select="my_groups"/>;
+
                </script>
 
                <xsl:choose>
@@ -416,6 +419,8 @@
                                
Window1=window.open(strURL,'Search',"left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
                        }
 
+                       var my_groups = <xsl:value-of select="my_groups"/>;
+
                </script>
                <table cellpadding="2" cellspacing="2" width="95%" 
align="center">
                        <xsl:choose>