[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9143]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9143] |
|
Date: |
Fri, 13 Apr 2012 08:41:03 +0000 |
Revision: 9143
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9143
Author: erikhl
Date: 2012-04-13 08:41:03 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/templates/base/activity_edit.php
trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
trunk/activitycalendarfrontend/templates/base/activity_new.php
trunk/activitycalendarfrontend/templates/base/organization_edit.php
trunk/activitycalendarfrontend/templates/base/organization_reciept.php
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-04-13
08:23:32 UTC (rev 9142)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-04-13
08:41:03 UTC (rev 9143)
@@ -154,7 +154,7 @@
$contact1 = array();
$contact1['name'] =
phpgw::get_var('org_contact1_name');
$contact1['phone'] =
phpgw::get_var('org_contact1_phone');
- $contact1['mail'] =
phpgw::get_var('org_contact1_email');
+ $contact1['mail'] =
phpgw::get_var('org_contact1_mail');
$contact1['org_id'] = $o_id;
$contact1['group_id'] = 0;
$this->so_activity->add_contact_person_local($contact1);
@@ -162,7 +162,7 @@
$contact2 = array();
$contact2['name'] =
phpgw::get_var('org_contact2_name');
$contact2['phone'] =
phpgw::get_var('org_contact2_phone');
- $contact2['mail'] =
phpgw::get_var('org_contact2_email');
+ $contact2['mail'] =
phpgw::get_var('org_contact2_mail');
$contact2['org_id'] = $o_id;
$contact2['group_id'] = 0;
$this->so_activity->add_contact_person_local($contact2);
@@ -196,7 +196,7 @@
$contact1 = array();
$contact1['name'] =
phpgw::get_var('group_contact1_name');
$contact1['phone'] =
phpgw::get_var('group_contact1_phone');
- $contact1['mail'] =
phpgw::get_var('group_contact1_email');
+ $contact1['mail'] =
phpgw::get_var('group_contact1_mail');
$contact1['org_id'] = 0;
$contact1['group_id'] = $g_id;
$this->so_activity->add_contact_person_local($contact1);
@@ -204,7 +204,7 @@
$contact2 = array();
$contact2['name'] =
phpgw::get_var('group_contact2_name');
$contact2['phone'] =
phpgw::get_var('group_contact2_phone');
- $contact2['mail'] =
phpgw::get_var('group_contact2_email');
+ $contact2['mail'] =
phpgw::get_var('group_contact2_mail');
$contact2['org_id'] = 0;
$contact2['group_id'] = $g_id;
$this->so_activity->add_contact_person_local($contact2);
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-04-13 08:23:32 UTC (rev 9142)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-04-13 08:41:03 UTC (rev 9143)
@@ -13,11 +13,11 @@
var div_select = document.getElementById('group_select');
<?php if($activity->get_group_id()){?>
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
if(org_id != null && org_id == 'new_org')
@@ -81,8 +81,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- 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 =
"/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_end = "</select>";
@@ -104,8 +104,8 @@
var address = document.getElementById('contact2_address_txt').value;
var div_address = document.getElementById('contact2_address_container');
- 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 =
"/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=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-04-13 08:23:32 UTC (rev 9142)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-04-13 08:41:03 UTC (rev 9143)
@@ -17,8 +17,8 @@
var org_id = document.getElementById('organization_id').value;
var div_select = document.getElementById('activity_select');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
var divcontent_start = "<select name=\"activity_id\" id=\"activity_id\">";
var divcontent_end = "</select>";
Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-04-13 08:23:32 UTC (rev 9142)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-04-13 08:41:03 UTC (rev 9143)
@@ -38,8 +38,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- 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 =
"/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_end = "</select>";
@@ -61,8 +61,8 @@
var address = document.getElementById('arena_address_txt').value;
var div_address = document.getElementById('arena_address_container');
- 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 =
"/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=\"arena_address\" id=\"arena_address\"
size\"5\">";
var divcontent_end = "</select>";
@@ -84,8 +84,8 @@
var address = document.getElementById('contact2_address_txt').value;
var div_address = document.getElementById('contact2_address_container');
- 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 =
"/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=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
Modified: trunk/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-04-13 08:23:32 UTC (rev 9142)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-04-13 08:41:03 UTC (rev 9143)
@@ -9,8 +9,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- 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 =
"/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_end = "</select>";
Modified: trunk/activitycalendarfrontend/templates/base/organization_reciept.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/organization_reciept.php
2012-04-13 08:23:32 UTC (rev 9142)
+++ trunk/activitycalendarfrontend/templates/base/organization_reciept.php
2012-04-13 08:41:03 UTC (rev 9143)
@@ -9,8 +9,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- 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 =
"/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_end = "</select>";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9143],
Erik Holm-Larsen <=