[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8121]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [8121] |
Date: |
Thu, 17 Nov 2011 13:26:42 +0000 |
Revision: 8121
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8121
Author: erikhl
Date: 2011-11-17 13:26:41 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiimport.inc.php
trunk/activitycalendar/inc/model/class.arena.inc.php
trunk/activitycalendar/templates/base/arena_list_partial.php
Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php 2011-11-17 11:42:10 UTC
(rev 8120)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php 2011-11-17 13:26:41 UTC
(rev 8121)
@@ -212,6 +212,7 @@
unset($activity_persons);
unset($activity_description);
unset($org_info);
+ unset($group_info);
unset($contact_person);
unset($contact1);
unset($contact2);
Modified: trunk/activitycalendar/inc/model/class.arena.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.arena.inc.php 2011-11-17
11:42:10 UTC (rev 8120)
+++ trunk/activitycalendar/inc/model/class.arena.inc.php 2011-11-17
13:26:41 UTC (rev 8121)
@@ -88,9 +88,8 @@
return array(
'id' => $this->get_id(),
'arena_name' => $this->get_arena_name(),
- 'internal_arena_id' =>
activitycalendar_soarena::get_instance()->get_building_name($this->get_internal_arena_id()),
'address' => $this->get_address(),
- 'active' => $this->is_active()
+ 'active' =>
($this->is_active())?'Aktiv':'Inaktiv'
);
}
}
Modified: trunk/activitycalendar/templates/base/arena_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/arena_list_partial.php
2011-11-17 11:42:10 UTC (rev 8120)
+++ trunk/activitycalendar/templates/base/arena_list_partial.php
2011-11-17 13:26:41 UTC (rev 8121)
@@ -59,7 +59,7 @@
'index.php?menuaction=activitycalendar.uiarena.query&phpgw_return_as=json<?php
echo $url_add_on; ?>&editable=<?php echo $editable ? "true" : "false"; ?>',
columnDefs,
'<?php echo $list_id ?>_form',
- ['<?php echo $list_id ?>_ctrl_search_query','<?php echo
$list_id ?>_ctrl_toggle_arena_type','<?php echo $list_id
?>_ctrl_toggle_active'],
+ ['<?php echo $list_id ?>_ctrl_search_query','<?php echo
$list_id ?>_ctrl_toggle_active'],
'<?php echo $list_id ?>_container',
'<?php echo $list_id ?>_paginator',
'<?php echo $list_id ?>',
@@ -75,7 +75,6 @@
function arena_export(ptype) {
var query = document.getElementById('<?php echo $list_id
?>_ctrl_search_query').value;
- var aType = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_arena_type').value;
var active = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_active').value;
<?php
/* FIXME Search queries will affect ALL data tables listed on one page
(of that type) when exporting
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8121],
Erik Holm-Larsen <=