[Fmsystem-commits] [8058]

[Erik Holm-Larsen]

Revision: 8058
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8058
Author:   erikhl
Date:     2011-11-09 06:47:34 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/inc/class.uiimport.inc.php
    trunk/activitycalendar/templates/base/organization.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-09 06:46:59 UTC 
(rev 8057)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-09 06:47:34 UTC 
(rev 8058)
@@ -450,6 +450,16 @@
                return $result;
        }
        
+       function get_district_from_id($d_id)
+       {
+               $this->db->query("SELECT name FROM fm_part_of_town where 
part_of_town_id={$d_id} ", __LINE__, __FILE__);
+               while($this->db->next_record()){
+                       $result = $this->db->f('name');
+               }       
+               return $result;
+       }
+       
+       
        function get_district_name($district_id)
        {
                //$result = "Ingen";

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-09 
06:46:59 UTC (rev 8057)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-09 
06:47:34 UTC (rev 8058)
@@ -127,6 +127,11 @@
                        $persons = $so_org->get_contacts($o_id);
                        $desc = $so_org->get_description($o_id);
                }
+               
+               if(strlen($desc) > 254)
+               {
+                       $desc = substr($desc,0,254);
+               }
                $arenas = $so_arena->get(null, null, null, null, null, null, 
null);
                if($activity->get_new_org())
                {

Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php   2011-11-09 06:46:59 UTC 
(rev 8057)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php   2011-11-09 06:47:34 UTC 
(rev 8058)
@@ -245,6 +245,7 @@
                                                {
                                                        
$arena->set_arena_name($arena_name);
                                                        
$arena->set_address($arena_address);
+                                                       
$arena->set_active(true);
                        
                                                        // All is good, store 
notification
                                                        if 
($soarena->store($arena)) {

Modified: trunk/activitycalendar/templates/base/organization.php
===================================================================
--- trunk/activitycalendar/templates/base/organization.php      2011-11-09 
06:46:59 UTC (rev 8057)
+++ trunk/activitycalendar/templates/base/organization.php      2011-11-09 
06:47:34 UTC (rev 8058)
@@ -36,9 +36,13 @@
                                <?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 }else{
+                                                       
if($organization->get_district() && 
is_numeric($organization->get_district())){?>
+                                                               <?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>
@@ -81,6 +85,7 @@
                                        <?php echo 
$organization->get_description();?>
                                <?php }?>
                                </dd>
+                               <?php if($contactperson1){?>
                                <dt><label>Kontaktperson 1</label></dt>
                                <dd><input type="hidden" name="contact1_id" 
value="<?php echo $contactperson1->get_id();?>"/></dd>
                                <dt><label for="contact1_name">Navn</label></dt>
@@ -95,6 +100,8 @@
                                <dd>
                                        <input type="text" 
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
                                </dd>
+                               <?php }?>
+                               <?php if($contactperson2){?>
                                <dt><label>Kontaktperson 2</label></dt>
                                <dd><input type="hidden" name="contact2_id" 
value="<?php echo $contactperson2->get_id();?>"/></dd>
                                <dt><label for="contact1_name">Navn</label></dt>
@@ -109,6 +116,7 @@
                                <dd>
                                        <input type="text" 
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
                                </dd>
+                               <?php }?>
                        </dl>
                        <div class="form-buttons">
                                <?php