[Fmsystem-commits] [12084] bkbooking: stavanger fixed edit contact persons on organization

[Kjell Arne Espedal]

Revision: 12084
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12084
Author:   kjell
Date:     2014-09-09 07:13:00 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
bkbooking: stavanger fixed edit contact persons on organization

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.boorganization.inc.php
    branches/stavangerkommune/booking/inc/class.uiorganization.inc.php
    branches/stavangerkommune/booking/templates/base/organization_edit.xsl

Modified: branches/stavangerkommune/booking/inc/class.boorganization.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boorganization.inc.php  
2014-09-08 13:16:11 UTC (rev 12083)
+++ branches/stavangerkommune/booking/inc/class.boorganization.inc.php  
2014-09-09 07:13:00 UTC (rev 12084)
@@ -51,7 +51,7 @@
                        if ($this->current_app() == 'bookingfrontend') {        
             
                                $defaultPermissions[self::ROLE_ADMIN] = array
                                (
-                                       'write' => 
array_fill_keys(array('name','homepage','phone','email','description','street','zip_code','district','city','active','organization_number'),
 true),
+                                       'write' => 
array_fill_keys(array('name','homepage','phone','email','description','street','zip_code','district','city','active','organization_number','contacts'),
 true),
                                );
                        }
                        

Modified: branches/stavangerkommune/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiorganization.inc.php  
2014-09-08 13:16:11 UTC (rev 12083)
+++ branches/stavangerkommune/booking/inc/class.uiorganization.inc.php  
2014-09-09 07:13:00 UTC (rev 12084)
@@ -248,8 +248,7 @@
                                        }
                                }
                        }
-                       $this->flash_form_errors($errors);
-                       $this->flash_form_errors($errors);
+               $this->flash_form_errors($errors);
                        $organization['cancel_link'] = 
self::link(array('menuaction' => $this->module . '.uiorganization.show', 'id' 
=> $id));
 
                        $contact_form_link = self::link(array('menuaction' => 
$this->module . '.uicontactperson.edit', ));

Modified: branches/stavangerkommune/booking/templates/base/organization_edit.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/organization_edit.xsl      
2014-09-08 13:16:11 UTC (rev 12083)
+++ branches/stavangerkommune/booking/templates/base/organization_edit.xsl      
2014-09-09 07:13:00 UTC (rev 12084)
@@ -197,7 +197,7 @@
                
                        <dl class="form-col" style='margin-top:0'>
                                <dt class='heading'><xsl:value-of 
select="php:function('lang', 'Admin 1')" /></dt>
-                       
+
                                <dt><label 
for="field_admin_name_1"><xsl:value-of select="php:function('lang', 'Name')" 
/></label><br /></dt>
                                <dd><input type='text' id='field_admin_name_1' 
name="contacts[0][name]" value='{organization/contacts[1]/name}'/></dd>