[Fmsystem-commits] [8104]

[Erik Holm-Larsen]

Revision: 8104
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8104
Author:   erikhl
Date:     2011-11-14 12:03:36 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/inc/class.uiorganization.inc.php

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-14 
11:06:10 UTC (rev 8103)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-14 
12:03:36 UTC (rev 8104)
@@ -396,6 +396,15 @@
                                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.send_mail', 'activity_id' => 
$value['id'],'message_type' => 'update')));
                                $value['labels'][] = lang('send_mail');
                                break;
+                       
+                       case 'new_activities':
+                               $value['ajax'][] = false;
+                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.edit', 'id' => $value['id'])));
+                               $value['labels'][] = lang('edit');
+                               $value['ajax'][] = false;
+                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.view', 'id' => $value['id'])));
+                               $value['labels'][] = lang('show');
+                               break;
                }
     }
     

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-11-14 
11:06:10 UTC (rev 8103)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-11-14 
12:03:36 UTC (rev 8104)
@@ -642,6 +642,29 @@
                                        $value['labels'][] = lang('edit');
                                }
                                break;
+                       case 'new_organizations':
+                               $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.show', 'id' => $value['id'])));
+                               }
+                               $value['labels'][] = lang('show');
+                               if($value['transferred'] == false)
+                               {
+                                       $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');
+                               }
+                               break;
                        case 'changed_groups':
                                $value['ajax'][] = false;
                                if($value['organization_id'] != '' && 
$value['organization_id'] != null){
@@ -665,6 +688,29 @@
                                        $value['labels'][] = lang('edit');
                                }
                                break;
+                       case 'new_groups':
+                               $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.show', 'id' => $value['id'])));
+                               }
+                               $value['labels'][] = lang('show');
+                               if($value['transferred'] == false)
+                               {
+                                       $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');
+                               }
+                               break;
                }
     }
 }