[Fmsystem-commits] [7976]

[Erik Holm-Larsen]

Revision: 7976
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7976
Author:   erikhl
Date:     2011-11-01 09:48:11 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.sogroup.inc.php
    trunk/activitycalendar/inc/class.uiorganization.inc.php
    trunk/activitycalendar/inc/model/class.group.inc.php
    trunk/activitycalendar/inc/model/class.organization.inc.php

Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php    2011-11-01 09:26:15 UTC 
(rev 7975)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php    2011-11-01 09:48:11 UTC 
(rev 7976)
@@ -269,7 +269,7 @@
                        
$group->set_description($this->unmarshal($this->db->f('description'), 
'string'));
                        
$group->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'), 
'int'));
                        
$group->set_change_type($this->unmarshal($this->db->f('change_type'), 
'string'));
-                       
$group->set_transferred($this->unmarshal($this->db->f('transferred')));
+                       
$group->set_transferred($this->unmarshal($this->db->f('transferred'), 'bool'));
                }
                return $group;
        }

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-11-01 
09:26:15 UTC (rev 7975)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-11-01 
09:48:11 UTC (rev 7976)
@@ -621,15 +621,18 @@
                                        $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.show', 'id' => $value['id'])));
                                }
                                $value['labels'][] = lang('show');
-                               $value['ajax'][] = false;
-                               if($value['organization_id'] != '' && 
$value['organization_id'] != null){
-                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' => 
'group')));
-                               }
-                               else
+                               if($value['transferred'] == false)
                                {
-                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+                                       $value['ajax'][] = false;
+                                       if($value['organization_id'] != '' && 
$value['organization_id'] != null){
+                                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' => 
'group')));
+                                       }
+                                       else
+                                       {
+                                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+                                       }
+                                       $value['labels'][] = lang('edit');
                                }
-                               $value['labels'][] = lang('edit');
                                break;
                        case 'changed_groups':
                                $value['ajax'][] = false;
@@ -641,15 +644,18 @@
                                        $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.show', 'id' => $value['id'])));
                                }
                                $value['labels'][] = lang('show');
-                               $value['ajax'][] = false;
-                               if($value['organization_id'] != '' && 
$value['organization_id'] != null){
-                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'], 'type' => 
'group')));
-                               }
-                               else
+                               if($value['transferred'] == false)
                                {
-                                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+                                       $value['ajax'][] = false;
+                                       if($value['organization_id'] != '' && 
$value['organization_id'] != null){
+                                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'], 'type' => 
'group')));
+                                       }
+                                       else
+                                       {
+                                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+                                       }
+                                       $value['labels'][] = lang('edit');
                                }
-                               $value['labels'][] = lang('edit');
                                break;
                }
     }

Modified: trunk/activitycalendar/inc/model/class.group.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.group.inc.php        2011-11-01 
09:26:15 UTC (rev 7975)
+++ trunk/activitycalendar/inc/model/class.group.inc.php        2011-11-01 
09:48:11 UTC (rev 7976)
@@ -90,7 +90,7 @@
                                'shortname' => $this->get_shortname(),
                                'description' => $this->get_description(),
                                'show_in_portal' => $this->get_show_in_portal(),
-                               'change_type' => $this->get_change_type(),
+                               'change_type' => lang($this->get_change_type()),
                                'transferred' => $this->get_transferred()
                        );
                }

Modified: trunk/activitycalendar/inc/model/class.organization.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.organization.inc.php 2011-11-01 
09:26:15 UTC (rev 7975)
+++ trunk/activitycalendar/inc/model/class.organization.inc.php 2011-11-01 
09:48:11 UTC (rev 7976)
@@ -128,6 +128,7 @@
                                'address'       =>      $this->get_address(),
                                'show_in_portal' => $this->get_show_in_portal(),
                                'change_type' => lang($this->get_change_type()),
+                               'transferred' => $this->get_transferred(),
                                'office' => 
$so_org->get_office_from_district($so_org->get_district_from_name($this->get_district()))
                        );
                }