[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14477]
|
From: |
Nelson Guerra |
|
Subject: |
[Fmsystem-commits] [14477] |
|
Date: |
Wed, 25 Nov 2015 23:53:45 +0000 |
Revision: 14477
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14477
Author: nelson224
Date: 2015-11-25 23:53:45 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/activitycalendar/inc/class.uiorganization.inc.php
Modified:
branches/dev-syncromind/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uiorganization.inc.php
2015-11-25 23:53:00 UTC (rev 14476)
+++ branches/dev-syncromind/activitycalendar/inc/class.uiorganization.inc.php
2015-11-25 23:53:45 UTC (rev 14477)
@@ -604,145 +604,149 @@
public function add_actions(&$value, $key, $params)
{
//Defining new columns
- $value['ajax'] = array();
+ /*$value['ajax'] = array();
$value['actions'] = array();
- $value['labels'] = array();
-
+ $value['labels'] = array();*/
+
+ $actions = array();
+
$query_type = $params[0];
switch($query_type)
{
case 'all_organizations':
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] != '' &&
$value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'booking.uigroup.show',
+ $url =
html_entity_decode(self::link(array('menuaction' => 'booking.uigroup.show',
'id' => $value['id'])));
}
else
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'booking.uiorganization.show',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'booking.uiorganization.show',
'id' => $value['id'])));
}
- $value['labels'][] = lang('show');
+ $actions[] = '<a
href="'.$url.'">'.lang('show').'</a>';
break;
case 'changed_organizations':
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] != '' &&
$value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
'id' => $value['id'])));
}
- $value['labels'][] = lang('show');
+ $actions[] = '<a
href="'.$url.'">'.lang('show').'</a>';
if($value['transferred'] == false)
{
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] !=
'' && $value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit',
'id' =>
$value['id'])));
}
- $value['labels'][] =
lang('edit');
+ $actions[] = '<a
href="'.$url.'">'.lang('edit').'</a>';
}
break;
case 'new_organizations':
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] != '' &&
$value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
'id' => $value['id'])));
}
- $value['labels'][] = lang('show');
+ $actions[] = '<a
href="'.$url.'">'.lang('show').'</a>';
if($value['transferred'] == false)
{
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] !=
'' && $value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit',
'id' =>
$value['id'])));
}
- $value['labels'][] =
lang('edit');
+ $actions[] = '<a
href="'.$url.'">'.lang('edit').'</a>';
}
break;
case 'changed_groups':
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] != '' &&
$value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
'id' => $value['id'])));
}
- $value['labels'][] = lang('show');
+ $actions[] = '<a
href="'.$url.'">'.lang('show').'</a>';
if($value['transferred'] == false)
{
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] !=
'' && $value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit',
'id' =>
$value['id'])));
}
- $value['labels'][] =
lang('edit');
+ $actions[] = '<a
href="'.$url.'">'.lang('edit').'</a>';
}
break;
case 'new_groups':
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] != '' &&
$value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show',
'id' => $value['id'])));
}
- $value['labels'][] = lang('show');
+ $actions[] = '<a
href="'.$url.'">'.lang('show').'</a>';
if($value['transferred'] == false)
{
- $value['ajax'][] = false;
+ //$value['ajax'][] = false;
if($value['organization_id'] !=
'' && $value['organization_id'] != null)
{
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit',
+ $url =
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',
+ $url =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit',
'id' =>
$value['id'])));
}
- $value['labels'][] =
lang('edit');
+ $actions[] = '<a
href="'.$url.'">'.lang('edit').'</a>';
}
break;
}
+
+ return $value['operations'] = implode(' | ', $actions);
}
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14477],
Nelson Guerra <=