[Fmsystem-commits] [7791]

[Erik Holm-Larsen]

Revision: 7791
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7791
Author:   erikhl
Date:     2011-10-04 07:09:45 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/setup/phpgw_no.lang
    trunk/activitycalendarfrontend/templates/base/activity.php

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-10-04 
06:28:18 UTC (rev 7790)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-10-04 
07:09:45 UTC (rev 7791)
@@ -160,14 +160,17 @@
                                }
                                else if($o_id == "change_org")
                                {
-                                       $org_info['name'] = 
phpgw::get_var('orgname');
-                                       $org_info['orgnr'] = 
phpgw::get_var('orgno');
-                                       $org_info['homepage'] = 
phpgw::get_var('homepage');
-                                       $org_info['phone'] = 
phpgw::get_var('phone');
-                                       $org_info['email'] = 
phpgw::get_var('email');
-                                       $org_info['description'] = 
phpgw::get_var('org_description');
-                                       $org_info['street'] = 
phpgw::get_var('address') . ' ' . phpgw::get_var('number') . ', ' . 
phpgw::get_var('postaddress');
-                                       $org_info['district'] = 
phpgw::get_var('org_district'); 
+                                       $change_org_id = 
phpgw::get_var('change_organization_id');
+                                       $organization = 
activitycalendar_soorganization::get_instance()->get_single($change_org_id);
+                               
+                                       $org_info['name'] = 
$organization->get_name();
+                                       $org_info['orgnr'] = 
$organization->get_organization_number();
+                                       $org_info['homepage'] = 
$organization->get_homepage();
+                                       $org_info['phone'] = 
$organization->get_phone();
+                                       $org_info['email'] = 
$organization->get_email();
+                                       $org_info['description'] = 
$organization->get_description();
+                                       $org_info['street'] = 
$organization->get_address();
+                                       $org_info['district'] = 
$organization->get_district(); 
                                        $org_info['status'] = "change";
                                        $o_id = 
$so_activity->add_organization_local($org_info);
                                        
@@ -188,7 +191,7 @@
                                        $contact2['group_id'] = 0;
                                        
$so_activity->add_contact_person_local($contact2);
                                        
-                                       $message = lang('change_request_ok');
+                                       $message = lang('change_request_ok', 
$organization->get_name());
                                        
                                        
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
 

Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang  2011-10-04 06:28:18 UTC 
(rev 7790)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang  2011-10-04 07:09:45 UTC 
(rev 7791)
@@ -61,4 +61,4 @@
 arena_helptext activitycalendarfrontend        no      Dersom aktiviteten skal 
finne sted på en ikke-kommunal arena, velges dette her.<br/>Dersom aktiviteten 
finner sted på flere arenaer, velg hovedarena her.
 messages_saved_form    activitycalendarfrontend        no      Aktiviteten ble 
lagret
 messages_form_error    activitycalendarfrontend        no      Det oppstod et 
problem under lagring
-change_request_ok      activitycalendarfrontend        no      Endringsønske 
for organisasjon er sendt inn
\ No newline at end of file
+change_request_ok      activitycalendarfrontend        no      Endringsønske 
for organisasjon er sendt inn for organisasjon %1
\ No newline at end of file

Modified: trunk/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity.php  2011-10-04 
06:28:18 UTC (rev 7790)
+++ trunk/activitycalendarfrontend/templates/base/activity.php  2011-10-04 
07:09:45 UTC (rev 7791)
@@ -18,16 +18,23 @@
        url = 
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&amp;phpgw_return_as=json&amp;orgid="
 + org_id;
 <?php }?>
 
-       if(org_id != null && (org_id == 'new_org' || org_id == 'change_org'))
+       if(org_id != null && org_id == 'new_org')
        {
                //alert('new_org');
                document.getElementById('new_org').style.display = "block";
                document.getElementById('new_org_fields').style.display = 
"block";
        }
+       else if(org_id != null && org_id == 'change_org')
+       {
+               document.getElementById('new_org').style.display = "block";
+               document.getElementById('new_org_fields').style.display = 
"none";
+               document.getElementById('change_org_fields').style.display = 
"block";
+       }
        else
        {
                document.getElementById('new_org').style.display = "none";
                document.getElementById('new_org_fields').style.display = 
"none";
+               document.getElementById('change_org_fields').style.display = 
"none";
                var divcontent_start = "<select name=\"group_id\" 
id=\"group_id\" onchange=\"javascript:checkNewGroup()\">";
                var divcontent_end = "</select>";
                
@@ -183,6 +190,17 @@
                                </dd>
                                <div id="new_org" style="display: none;">
                                        <hr/>
+                                       <div id="change_org_fields" 
style="display: none;">
+                                               <select 
name="change_organization_id" id="change_organization_id" >
+                                                       <option value="">Ingen 
organisasjon valgt</option>
+                                                       <?php
+                                                       foreach($organizations 
as $organization)
+                                                       {
+                                                               echo "<option 
".($current_organization_id == $organization->get_id() ? 'selected="selected"' 
: "")." 
value=\"{$organization->get_id()}\">".$organization->get_name()."</option>";
+                                                       }
+                                                       ?>
+                                               </select>
+                                       </div>
                                        <div id="new_org_fields" 
style="display: none;">
                                                <label 
for="orgname">Organisasjonsnavn</label>
                                                <input type="text" 
name="orgname"/><br/>