[Fmsystem-commits] [16927] activitycalendar: issue #FDV-160

[sigurdne]

Revision: 16927
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16927
Author:   sigurdne
Date:     2017-07-07 09:33:15 -0400 (Fri, 07 Jul 2017)
Log Message:
-----------
activitycalendar: issue #FDV-160

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/phpgwapi/js/jquery/common.js

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2017-07-07 
10:59:15 UTC (rev 16926)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2017-07-07 
13:33:15 UTC (rev 16927)
@@ -1058,7 +1058,7 @@
                        }
                }
 
-               function send_email_to_selection( $activities )
+               function send_email_to_selection( $activities, $skip_redirect = 
false )
                {
                        $c = createobject('phpgwapi.config', 
'activitycalendarfrontend');
                        $c->read();
@@ -1134,8 +1134,11 @@
                                }
                        }
 
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index',
+                       if(!$skip_redirect)
+                       {
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index',
                                'message' => 'E-post sendt'));
+                       }
                }
 
                public function send_mail()

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2017-07-07 
10:59:15 UTC (rev 16926)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2017-07-07 
13:33:15 UTC (rev 16927)
@@ -696,7 +696,7 @@
 
                        if (isset($_POST['step_1']))
                        { //change_request
-                               $activity_id = phpgw::get_var('activity_id');
+                               $activity_id = phpgw::get_var('activity_id', 
'int');
                                $activity = 
$this->so_activity->get_single($activity_id);
                                $org = 
$this->so_organization->get_single($activity->get_organization_id());
 
@@ -705,7 +705,7 @@
                                //$activity->set_state(2);
                                //if($this->so_activity->store($activity))
                                //{
-                               
$this->send_email_to_selection(array($activity));
+                               
$this->send_email_to_selection(array($activity), $skip_redirect = true);
                                $message = lang('update_request_sent', 
$activity->get_title(), $org->get_name());
                                return 
self::render_template_xsl('activity_edit_step_1', array
                                                (
@@ -1400,7 +1400,8 @@
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
 
                        $org_id = phpgw::get_var('orgid');
-                       $returnHTML = "<option value='0'>Ingen aktivitet 
valgt</option>";
+                       $activity_ret = array();
+                       $activity_ret[] = array('id'=> 0, 'name' => 'Ingen 
aktivitet valgt');
                        if ($org_id)
                        {
                                $activities = $this->so_activity->get(0, 0, 
'title', true, '', '', array(
@@ -1407,17 +1408,15 @@
                                        'activity_state' => 3, 'activity_org' 
=> $org_id));
                                foreach ($activities as $act)
                                {
-                                       if (isset($act))
+                                       if (!empty($act))
                                        {
-                                               //$res_g = $group->serialize();
-                                               $activity_html[] = "<option 
value='" . $act->get_id() . "'>" . $act->get_title() . "</option>";
+                                               $activity_ret[] = array(
+                                                       'id'=>  $act->get_id(),
+                                                       'name' => 
$act->get_title()
+                                               );
                                        }
                                }
-                               $html = implode(' ', $activity_html);
-                               $returnHTML = $returnHTML . ' ' . $html;
                        }
-
-
-                       return $returnHTML;
+                       return array('ResultSet' => array('Result' => 
$activity_ret));
                }
        }
\ No newline at end of file

Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js  2017-07-07 10:59:15 UTC (rev 16926)
+++ trunk/phpgwapi/js/jquery/common.js  2017-07-07 13:33:15 UTC (rev 16927)
@@ -1277,7 +1277,16 @@
                {
                        var option = document.createElement('option');
                        option.text = value.name;
-                       option.setAttribute('value', value.name);
+
+                       if(typeof(value.id) !=='undefined')
+                       {
+                               option.setAttribute('value', value.id);
+                       }
+                       else
+                       {
+                               option.setAttribute('value', value.name);
+                       }
+
                        select.appendChild(option);
                });
                if (r.length > 0)