[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9509] Bugfix:
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9509] Bugfix: |
|
Date: |
Tue, 05 Jun 2012 08:06:22 +0000 |
Revision: 9509
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9509
Author: erikhl
Date: 2012-06-05 08:06:21 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Bugfix:
* Address-search does not show selected address inn address-field - Fixed
* Districts are removed when transferring org/group to booking - Fixed
* Contact persons does not display in edit-mode - Fixed
Modified Paths:
--------------
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/templates/base/activity.php
trunk/activitycalendarfrontend/templates/base/activity_edit.php
trunk/activitycalendarfrontend/templates/base/activity_new.php
trunk/activitycalendarfrontend/templates/base/activity_new_org.php
trunk/activitycalendarfrontend/templates/base/organization_edit.php
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-06-05
08:05:15 UTC (rev 9508)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-06-05
08:06:21 UTC (rev 9509)
@@ -583,7 +583,7 @@
$person_arr =
$this->so_contact->get_booking_contact_persons($activity->get_group_id(), true);
foreach($person_arr as $p)
{
- $persons[] = $p;
+ $persons_array[] = $p;
}
$desc =
$this->so_group->get_description($activity->get_group_id());
$group =
$this->so_group->get_single($activity->get_group_id());
@@ -658,6 +658,8 @@
'activity' => $activity,
'organization' => $organization,
'group' => $group,
+
'contact1' => $persons_array[0],
+
'contact2' => $persons_array[1],
'arenas' => $arenas,
'buildings' => $buildings,
'categories' => $categories,
@@ -684,6 +686,8 @@
(
'activity' => $activity,
'organization' => $organization,
+
'contact1' => $persons_array[0],
+
'contact2' => $persons_array[1],
'org_name' => $org_name,
'group' => $group,
'arenas' => $arenas,
@@ -711,6 +715,8 @@
'activity' => $activity,
'organization' => $organization,
'group' => $group,
+
'contact1' => $persons_array[0],
+
'contact2' => $persons_array[1],
'arenas' => $arenas,
'buildings' => $buildings,
'categories' => $categories,
Modified: trunk/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity.php 2012-06-05
08:05:15 UTC (rev 9508)
+++ trunk/activitycalendarfrontend/templates/base/activity.php 2012-06-05
08:06:21 UTC (rev 9509)
@@ -130,7 +130,9 @@
</dt>
<dd>
<?php echo $organization->get_name();?>
- <a
href="index.php?menuaction=activitycalendarfrontend.uiactivity.edit_organization_values&organization_id=<?php
echo $organization->get_id();?>"><?php echo lang('edit_organization');?></a>
+ <?php if(!$activity->get_new_org()){?>
+ <a
href="index.php?menuaction=activitycalendarfrontend.uiactivity.edit_organization_values&organization_id=<?php
echo $organization->get_id();?>"><?php echo lang('edit_organization');?></a>
+ <?php }?>
</dd>
<dt>
<label for="group_id"
id="group_label"><?php echo lang('group') ?></label>
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-06-05 08:05:15 UTC (rev 9508)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-06-05 08:06:21 UTC (rev 9509)
@@ -78,14 +78,15 @@
function get_address_search()
{
- var address = document.getElementById('address_txt').value;
+ var address = document.getElementById('address').value;
var div_address = document.getElementById('address_container');
+ div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/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\" id=\"address\" size\"5\">";
-var divcontent_end = "</select>";
+ var divcontent_start = "<select name=\"address_select\" id=\"address\"
size=\"5\" onChange='setAddressValue(this)'>";
+ var divcontent_end = "</select>";
var callback = {
success: function(response){
@@ -101,14 +102,15 @@
function get_address_search_cp2()
{
- var address = document.getElementById('contact2_address_txt').value;
- var div_address = document.getElementById('contact2_address_container');
+ var address = document.getElementById('contact2_address').value;
+ var div_address =
document.getElementById('contact2_address_container');'
+ div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/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=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
-var divcontent_end = "</select>";
+ var divcontent_start = "<select name=\"contact2_address_select\"
id=\"address_cp2\" size=\"5\" onChange='setAddressValue(this)'>";
+ var divcontent_end = "</select>";
var callback = {
success: function(response){
@@ -122,6 +124,26 @@
}
+function setAddressValue(field)
+{
+ if(field.name == 'contact2_address_select')
+ {
+ var address = document.getElementById('contact2_address');
+ var div_address = document.getElementById('contact2_address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+ else
+ {
+ var address = document.getElementById('address');
+ var div_address = document.getElementById('address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+}
+
function allOK()
{
if(document.getElementById('title').value == null ||
document.getElementById('title').value == '')
@@ -234,7 +256,7 @@
<label for="special_adaptation"><?php
echo lang('special_adaptation') ?></label>
</dt>
<dd>
- <input type="checkbox"
name="special_adaptation" id="special_adaptation" />
+ <input type="checkbox"
name="special_adaptation" id="special_adaptation" <?php echo
$activity->get_special_adaptation() ? ' checked="checked"' : '' ?>/>
</dd>
<hr />
<h2><?php echo lang('where_when')?></h2>
Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-06-05 08:05:15 UTC (rev 9508)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-06-05 08:06:21 UTC (rev 9509)
@@ -35,13 +35,14 @@
function get_address_search()
{
- var address = document.getElementById('address_txt').value;
+ var address = document.getElementById('address').value;
var div_address = document.getElementById('address_container');
+ div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/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\" id=\"address\" size\"5\">";
+var divcontent_start = "<select name=\"address\" id=\"address\" size=\"5\"
onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
var callback = {
@@ -58,13 +59,14 @@
function get_address_search_arena()
{
- var address = document.getElementById('arena_address_txt').value;
+ var address = document.getElementById('arena_address').value;
var div_address = document.getElementById('arena_address_container');
+ div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/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=\"arena_address\" id=\"arena_address\"
size\"5\">";
+var divcontent_start = "<select name=\"arena_address_select\"
id=\"arena_address\" size=\"5\" onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
var callback = {
@@ -81,13 +83,14 @@
function get_address_search_cp2()
{
- var address = document.getElementById('contact2_address_txt').value;
+ var address = document.getElementById('contact2_address').value;
var div_address = document.getElementById('contact2_address_container');
+ div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/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=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
+var divcontent_start = "<select name=\"contact2_address_select\"
id=\"address_cp2\" size=\"5\" onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
var callback = {
@@ -102,6 +105,34 @@
}
+function setAddressValue(field)
+{
+ if(field.name == 'contact2_address_select')
+ {
+ var address = document.getElementById('contact2_address');
+ var div_address = document.getElementById('contact2_address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+ else if(field.name == 'arena_address_select')
+ {
+ var address = document.getElementById('arena_address');
+ var div_address = document.getElementById('arena_address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+ else
+ {
+ var address = document.getElementById('address');
+ var div_address = document.getElementById('address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+}
+
function run_checks()
{
check_external();
@@ -239,12 +270,10 @@
</dt>
<dd>
<?php
- $current_district_ids =
$activity->get_district();
- $current_district_id_array=explode(",",
$current_district_ids);
foreach($districts as $d)
{
?>
- <input name="district[]"
type="checkbox" value="<?php echo $d['part_of_town_id']?>" <?php echo
(in_array($d['part_of_town_id'], $current_district_id_array) ? 'checked' :
"")?>/><?php echo $d['name']?><br/>
+ <input name="district[]"
type="checkbox" value="<?php echo $d['part_of_town_id']?>" /><?php echo
$d['name']?><br/>
<?php
}
?>
@@ -303,7 +332,7 @@
<dt><label for="arena_name"><?php echo
lang('name') ?></label></dt>
<dd><input type="text"
name="arena_name" id="arena_name" /></dd>
<dt><label for="arena_address"><?php
echo lang('address') ?></label></dt>
- <dd><input type="text"
name="arena_address_txt" id="arena_address_txt"
onkeyup="javascript:get_address_search_arena()"/>
+ <dd><input type="text"
name="arena_address" id="arena_address"
onkeyup="javascript:get_address_search_arena()"/>
<div id="arena_address_container"></div>
<label for="arena_number">Nummer</label>
<input type="text"
name="arena_number"/><br/>
@@ -335,7 +364,7 @@
</dd>
<dt>Kontaktinformasjon for kulturkontoret
(*)</dt>
<dt><label
for="contact2_address">Adresse</label>
- <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
+ <dd><input type="text" name="contact2_address"
id="contact2_address" onkeyup="javascript:get_address_search_cp2()"/>
<div id="contact2_address_container"></div></dd>
<dt><label
for="contact2_number">Husnummer</label></dt>
<dd><input type="text"
name="contact2_number"/></dd>
Modified: trunk/activitycalendarfrontend/templates/base/activity_new_org.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new_org.php
2012-06-05 08:05:15 UTC (rev 9508)
+++ trunk/activitycalendarfrontend/templates/base/activity_new_org.php
2012-06-05 08:06:21 UTC (rev 9509)
@@ -22,18 +22,19 @@
function get_address_search()
{
- var address = document.getElementById('address_txt').value;
+ var address = document.getElementById('address').value;
var div_address = document.getElementById('address_container');
+ div_address.style.display="block";
//url =
"/aktivby/registreringsskjema/ny/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\" id=\"address\" size\"5\">";
+var divcontent_start = "<select name=\"address_select\" id=\"address_select\"
size=\"5\" onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
var callback = {
success: function(response){
- div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -43,6 +44,15 @@
}
+function setAddressValue(field)
+{
+ var address = document.getElementById('address');
+ var div_address = document.getElementById('address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+}
+
function allOK()
{
if(document.getElementById('orgname').value == null ||
document.getElementById('orgname').value == '')
@@ -137,7 +147,7 @@
<dt><label for="phone">Telefon (*)</label></dt>
<dd><input type="text" name="phone"/></dd>
<dt><label for="street">Gate (*)</label></dt>
- <dd><input type="text" name="address_txt"
id="address_txt" onkeyup="javascript:get_address_search()"/>
+ <dd><input type="text" name="address"
id="address" onkeyup="javascript:get_address_search()"/>
<div id="address_container"></div></dd>
<dt><label for="number">Husnummer</label></dt>
<dd><input type="text" name="number"/><br/></dd>
Modified: trunk/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-06-05 08:05:15 UTC (rev 9508)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-06-05 08:06:21 UTC (rev 9509)
@@ -6,13 +6,14 @@
<script type="text/javascript">
function get_address_search()
{
- var address = document.getElementById('address_txt').value;
+ var address = document.getElementById('address').value;
var div_address = document.getElementById('address_container');
+ 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;
-var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
+var divcontent_start = "<select name=\"address_select\" id=\"address_select\"
size\"5\">";
var divcontent_end = "</select>";
var callback = {
@@ -27,6 +28,15 @@
}
+function setAddressValue(field)
+{
+ var address = document.getElementById('address');
+ var div_address = document.getElementById('address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+}
+
function allOK()
{
if(document.getElementById('title').value == null ||
document.getElementById('title').value == '')
@@ -359,6 +369,7 @@
<dd><input type="text"
name="phone" value="<?php echo $organization->get_phone()?>"/></dd>
<dt><label
for="street">Gate</label></dt>
<dd><input type="text"
name="address" id="address" value="<?php echo $organization->get_address()?>"/>
+ <div
id="address_container"></div></dd>
<dt><label
for="org_description">Beskrivelse</label></dt>
<dd><textarea rows="10"
cols="100" name="org_description"><?php echo
$organization->get_description()?></textarea></dd>
<hr/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9509] Bugfix:,
Erik Holm-Larsen <=