[Fmsystem-commits] [14723] property: fix removal of default status

[Sigurd Nes]

Revision: 14723
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14723
Author:   sigurdne
Date:     2016-02-11 14:17:53 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
property: fix removal of default status

Modified Paths:
--------------
    trunk/property/inc/class.sodimb_role_user.inc.php
    trunk/property/inc/class.uidimb_role_user.inc.php
    trunk/property/js/portico/ajax_dimb_role_user.js

Modified: trunk/property/inc/class.sodimb_role_user.inc.php
===================================================================
--- trunk/property/inc/class.sodimb_role_user.inc.php   2016-02-11 13:21:13 UTC 
(rev 14722)
+++ trunk/property/inc/class.sodimb_role_user.inc.php   2016-02-11 14:17:53 UTC 
(rev 14723)
@@ -190,25 +190,37 @@
 
                public function edit($data)
                {
-                       $active_from    = 
phpgwapi_datetime::date_to_timestamp($data['active_from']);
-                       $active_to              = 
phpgwapi_datetime::date_to_timestamp($data['active_to']);
-                       $delete                 = isset($data['delete']) && 
is_array($data['delete']) ? $data['delete'] : array();
-                       $default_user   = isset($data['default_user']) && 
is_array($data['default_user']) ? $data['default_user'] : array();
-                       $alter_date     = isset($data['alter_date']) && 
is_array($data['alter_date']) ? $data['alter_date'] : array();
-                       $add                    = isset($data['add']) && 
is_array($data['add']) ? $data['add'] : array();
+                       $active_from            = 
phpgwapi_datetime::date_to_timestamp($data['active_from']);
+                       $active_to                      = 
phpgwapi_datetime::date_to_timestamp($data['active_to']);
+                       $delete                         = 
isset($data['delete']) && is_array($data['delete']) ? $data['delete'] : array();
+                       $default_user_orig      = 
isset($data['default_user_orig']) && is_array($data['default_user_orig']) ? 
$data['default_user_orig'] : array();
+                       $default_user           = isset($data['default_user']) 
&& is_array($data['default_user']) ? $data['default_user'] : array();
+                       $alter_date                     = 
isset($data['alter_date']) && is_array($data['alter_date']) ? 
$data['alter_date'] : array();
+                       $add                            = isset($data['add']) 
&& is_array($data['add']) ? $data['add'] : array();
 
                        $this->db->transaction_begin();
 
                        $c_default_user = 0;
                        foreach($default_user as $id)
                        {
-                               if(!in_array($id, $delete))
+                               if(!in_array($id, $delete) && !in_array($id, 
$default_user_orig))
                                {
                                        $this->db->query("UPDATE 
fm_ecodimb_role_user SET default_user = 1 WHERE id = '{$id}'", __LINE__, 
__FILE__);
                                        $c_default_user ++;
                                }
                        }
+                       unset($id);
 
+                       $c_default_user_orig = 0;
+                       foreach($default_user_orig as $id)
+                       {
+                               if($id && !in_array($id, $delete) && 
!in_array($id, $default_user))
+                               {
+                                       $this->db->query("UPDATE 
fm_ecodimb_role_user SET default_user = 0 WHERE id = '{$id}'", __LINE__, 
__FILE__);
+                                       $c_default_user_orig ++;
+                               }
+                       }
+
                        unset($id);
 
                        $c_alter_date = 0;
@@ -280,8 +292,13 @@
 
                                if($c_default_user)
                                {
-                                       phpgwapi_cache::message_set(lang('%1 
roles set at default', $c_default_user), 'message');
+                                       phpgwapi_cache::message_set(lang('%1 
roles set as default', $c_default_user), 'message');
                                }
+
+                               if($c_default_user_orig)
+                               {
+                                       phpgwapi_cache::message_set(lang('%1 
roles removed as default', $c_default_user_orig), 'message');
+                               }
                        }
 
                        return $ok;

Modified: trunk/property/inc/class.uidimb_role_user.inc.php
===================================================================
--- trunk/property/inc/class.uidimb_role_user.inc.php   2016-02-11 13:21:13 UTC 
(rev 14722)
+++ trunk/property/inc/class.uidimb_role_user.inc.php   2016-02-11 14:17:53 UTC 
(rev 14723)
@@ -68,48 +68,6 @@
                        $this->config->read();
                }
 
-               public function add_javascript($app, $pkg, $name)
-               {
-                       return $GLOBALS['phpgw']->js->validate_file($pkg, 
str_replace('.js', '', $name), $app);
-               }
-
-               /**
-               * A more flexible version of xslttemplate.add_file
-               */
-               public function add_template_file($tmpl)
-               {
-                       if(is_array($tmpl))
-                       {
-                               foreach($tmpl as $t)
-                               {
-                                       $this->add_template_file($t);
-                               }
-                               return;
-                       }
-                       foreach(array_reverse($this->tmpl_search_path) as $path)
-                       {
-                               $filename = $path . '/' . $tmpl . '.xsl';
-                               if(file_exists($filename))
-                               {
-                                       
$GLOBALS['phpgw']->xslttpl->xslfiles[$tmpl] = $filename;
-                                       return;
-                               }
-                       }
-                       echo "Template $tmpl not found in search path: ";
-                       print_r($this->tmpl_search_path);
-                       die;
-               }
-
-               public function link($data)
-               {
-                       return $GLOBALS['phpgw']->link('/index.php', $data);
-               }
-
-               public function redirect($link_data)
-               {
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
$link_data);
-               }
-
                function index()
                {
                        $receipt = array();
@@ -264,17 +222,20 @@
                                if($entry['active_from'])
                                {
                                        $default_user_checked = 
$entry['default_user'] == 1 ? 'checked = "checked"' : '';
-                                       $entry['default_user'] = "<input 
id=\"default_user\" type =\"checkbox\" $default_user_checked 
name=\"values[default_user][]\" value=\"{$entry['id']}\">";
-                                       $entry['delete'] = "<input 
id=\"delete\" type =\"checkbox\" name=\"values[delete][]\" 
value=\"{$entry['id']}\">";
-                                       $entry['alter_date'] = "<input 
id=\"alter_date\" type =\"checkbox\" name=\"values[alter_date][]\" 
value=\"{$entry['id']}\">";
+                                       $default_user_orig = 
$entry['default_user'] == 1 ? $entry['id'] : '';
+                                       $entry['default_user']= "<input  type 
=\"hidden\"  name=\"values[default_user_orig][]\" 
value=\"{$default_user_orig}\">";
+                                       $entry['default_user'] .= "<input 
class=\"default_user\" id=\"default_user\" type =\"checkbox\" 
$default_user_checked name=\"values[default_user][]\" 
value=\"{$entry['id']}\">";
+                                       $entry['delete'] = "<input 
class=\"delete\" id=\"delete\" type =\"checkbox\" name=\"values[delete][]\" 
value=\"{$entry['id']}\">";
+                                       $entry['alter_date'] = "<input 
class=\"alter_date\" id=\"alter_date\" type =\"checkbox\" 
name=\"values[alter_date][]\" value=\"{$entry['id']}\">";
                                        $entry['add'] = '';
                                }
                                else
                                {
+                                       $entry['default_user_orig']= '';
                                        $entry['default_user'] = '';
                                        $entry['delete'] = '';
                                        $entry['alter_date'] = '';
-                                       $entry['add'] = "<input id=\"add\" type 
=\"checkbox\" name=\"values[add][]\" 
value=\"{$entry['ecodimb']}_{$entry['role_id']}_{$entry['user_id']}\">";        
                   
+                                       $entry['add'] = "<input class=\"add\" 
id=\"add\" type =\"checkbox\" name=\"values[add][]\" 
value=\"{$entry['ecodimb']}_{$entry['role_id']}_{$entry['user_id']}\">";
                                }
                                $results['results'][] = $entry;
                        }

Modified: trunk/property/js/portico/ajax_dimb_role_user.js
===================================================================
--- trunk/property/js/portico/ajax_dimb_role_user.js    2016-02-11 13:21:13 UTC 
(rev 14722)
+++ trunk/property/js/portico/ajax_dimb_role_user.js    2016-02-11 14:17:53 UTC 
(rev 14723)
@@ -97,6 +97,17 @@
        $("#receipt").html('');
 }
 
+var addFooterDatatable = function (oTable)
+{
+       var api = oTable.api();
 
 
-
+       var newTD = JqueryPortico.CreateRowChecked("default_user");
+       $(api.column(3).footer()).html(newTD);
+       var newTD = JqueryPortico.CreateRowChecked("add");
+       $(api.column(6).footer()).html(newTD);
+       var newTD = JqueryPortico.CreateRowChecked("delete");
+       $(api.column(7).footer()).html(newTD);
+       var newTD = JqueryPortico.CreateRowChecked("alter_date");
+       $(api.column(8).footer()).html(newTD);
+}