[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9906] added blank option on address-select
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [9906] added blank option on address-select |
Date: |
Thu, 23 Aug 2012 10:02:02 +0000 |
Revision: 9906
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9906
Author: erikhl
Date: 2012-08-23 10:02:00 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
added blank option on address-select
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soarena.inc.php
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/templates/base/organization_edit.php
Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php 2012-08-23 08:29:33 UTC
(rev 9905)
+++ trunk/activitycalendar/inc/class.soarena.inc.php 2012-08-23 10:02:00 UTC
(rev 9906)
@@ -305,11 +305,11 @@
$this->db->query($sql, __LINE__, __FILE__);
while($this->db->next_record()){
//$result_arr = $this->db->f('name');
- //if($curr_index == 0){
- //$result_arr[] = "<option value='0'>Velg
gateadresse</option>";
- //}
+ if($curr_index == 0){
+ $result_arr[] = "<option value='0'>Velg
gateadresse</option>";
+ }
$result_arr[] = "<option value='" .
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
- //$curr_index++;
+ $curr_index++;
}
}
$result = implode(' ' , $result_arr);
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-23
08:29:33 UTC (rev 9905)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-23
10:02:00 UTC (rev 9906)
@@ -852,6 +852,11 @@
}
else
{
+ $c =
createobject('phpgwapi.config','activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $ajaxUrl = $c->config_data['AJAXURL'];
$organization =
$this->so_organization->get_single($org_id);
$person_arr =
$this->so_contact->get(null, null, null, null, null, null,
array('organization_id' => $org_id));
foreach($person_arr as $p)
@@ -865,7 +870,8 @@
'contact1' =>
$persons[0],
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
- 'error' =>
isset($error) ? $error : phpgw::get_var('error')
+ 'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'ajaxURL' => $ajaxUrl
)
);
}
Modified: trunk/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-08-23 08:29:33 UTC (rev 9905)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-08-23 10:02:00 UTC (rev 9906)
@@ -11,7 +11,7 @@
div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url = "<?php echo
$ajaxURL?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address_select\" id=\"address_select\"
size\"5\" onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9906] added blank option on address-select,
Erik Holm-Larsen <=