[Fmsystem-commits] [7805]

[Erik Holm-Larsen]

Revision: 7805
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7805
Author:   erikhl
Date:     2011-10-04 08:44:20 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/templates/base/organization.php

Modified: trunk/activitycalendar/templates/base/organization.php
===================================================================
--- trunk/activitycalendar/templates/base/organization.php      2011-10-04 
08:38:11 UTC (rev 7804)
+++ trunk/activitycalendar/templates/base/organization.php      2011-10-04 
08:44:20 UTC (rev 7805)
@@ -33,8 +33,12 @@
                                                        <option value="<?php 
echo $d['part_of_town_id']?>" <?php echo ($curr_district == 
$d['part_of_town_id'])? 'selected' : '' ?>><?php echo $d['name']?></option>
                                                <?php }?>
                                        </select>
-                               <?php }else{?>
-                                       <?php echo 
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
+                               <?php }else{
+                                               
if($organization->get_change_type() == 'new'){?>
+                                                       <?php echo 
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
+                                       <?php }else{?>
+                                                       <?php echo 
$organization->get_district();?>
+                                       <?php }?>
                                <?php }?>
                                </dd>
                                <dt><label 
for="homepage">Hjemmeside</label></dt>