[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8899]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8899] |
|
Date: |
Thu, 16 Feb 2012 12:48:22 +0000 |
Revision: 8899
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8899
Author: erikhl
Date: 2012-02-16 12:48:22 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiorganization.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/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-02-16
12:47:10 UTC (rev 8898)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-02-16
12:48:22 UTC (rev 8899)
@@ -178,7 +178,7 @@
//set local group as stored
$group->set_change_type('added');
$group->set_transferred(true);
- $so_group->update_local($group);
+ $sogroup->update_local($group);
}
else
{
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-02-16 12:47:10 UTC (rev 8898)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit.php
2012-02-16 12:48:22 UTC (rev 8899)
@@ -13,9 +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 =
"/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 =
"/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')
@@ -79,7 +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 =
"/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>";
@@ -102,6 +105,7 @@
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;
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-02-16 12:47:10 UTC (rev 8898)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-02-16 12:48:22 UTC (rev 8899)
@@ -17,7 +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 =
"/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-02-16 12:47:10 UTC (rev 8898)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-02-16 12:48:22 UTC (rev 8899)
@@ -38,7 +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 =
"/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>";
@@ -60,7 +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 =
"/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>";
@@ -82,7 +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 =
"/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-02-16 12:47:10 UTC (rev 8898)
+++ trunk/activitycalendarfrontend/templates/base/organization_edit.php
2012-02-16 12:48:22 UTC (rev 8899)
@@ -9,7 +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 =
"/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-02-16 12:47:10 UTC (rev 8898)
+++ trunk/activitycalendarfrontend/templates/base/organization_reciept.php
2012-02-16 12:48:22 UTC (rev 8899)
@@ -9,7 +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 =
"/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] [8899],
Erik Holm-Larsen <=