From b8201c9f867f6412689408d33ff1d4ecb6e2db9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Aug 2016 23:46:12 +0200
Subject: [PATCH] Fix fk_soc can be null because we can set notification for
users only.
---
.../install/mysql/migration/4.0.0-5.0.0.sql | 10 +-
.../install/mysql/tables/llx_notify_def.sql | 3 +-
htdocs/user/notify/card.php | 109 ++++++++++--------
3 files changed, 69 insertions(+), 53 deletions(-)
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 443afa13289..7740c6dc28f 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -13,10 +13,10 @@
-- To drop an index: -- VPGSQL8.0 DROP INDEX nomindex
-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
--- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
--- To set a field as NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
--- To set a field as default NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- To make pk to be auto increment (mysql): -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL: -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as default NULL: -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
-- Note: fields with type BLOB/TEXT can't have default value.
-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
@@ -45,3 +45,5 @@ ALTER TABLE llx_notify ADD COLUMN type_target varchar(16) NULL;
ALTER TABLE llx_entrepot DROP COLUMN valo_pmp;
+ALTER TABLE llx_notify_def MODIFY COLUMN fk_soc integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_notify_def ALTER COLUMN fk_soc SET DEFAULT NULL;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
index 28055c76cfe..a3fc123c8dd 100644
--- a/htdocs/install/mysql/tables/llx_notify_def.sql
+++ b/htdocs/install/mysql/tables/llx_notify_def.sql
@@ -1,5 +1,6 @@
-- ===================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ create table llx_notify_def
tms timestamp,
datec date, -- date de creation
fk_action integer NOT NULL,
- fk_soc integer NOT NULL,
+ fk_soc integer,
fk_contact integer,
fk_user integer,
type varchar(16) DEFAULT 'email'
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 996a6fba370..ec3691e85db 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -52,7 +52,7 @@ $offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="a.daten";
+if (! $sortfield) $sortfield="n.daten";
$now=dol_now();
@@ -137,8 +137,11 @@ if ($result > 0)
dol_fiche_head($head, 'notify', $langs->trans("User"),0,'user');
-
- print '<table class="border"width="100%">';
+ $linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
+
+ dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+
+ /*print '<table class="border"width="100%">';
// Ref
print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
@@ -160,7 +163,7 @@ if ($result > 0)
print '<td colspan="2">'.dol_print_email($object->email,0,0,1).'</td>';
print "</tr>\n";
- print '</table>';
+ print '</table>';*/
dol_fiche_end();
@@ -187,9 +190,9 @@ if ($result > 0)
// Line with titles
print '<table width="100%" class="noborder">';
print '<tr class="liste_titre">';
- print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
print_liste_field_titre('');
print "</tr>\n";
@@ -242,22 +245,6 @@ if ($result > 0)
print '</form>';
print '<br>';
- // List of active notifications
- print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
- $var=true;
-
- // Line with titles
- print '<table width="100%" class="noborder">';
- print '<tr class="liste_titre">';
- print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder);
- print_liste_field_titre('','','');
- print '</tr>';
-
- $langs->load("errors");
- $langs->load("other");
-
// List of notifications enabled for contacts
$sql = "SELECT n.rowid, n.type,";
$sql.= " a.code, a.label,";
@@ -268,12 +255,36 @@ if ($result > 0)
$sql.= " WHERE a.rowid = n.fk_action";
$sql.= " AND c.rowid = n.fk_user";
$sql.= " AND c.rowid = ".$object->id;
-
+
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
- $i = 0;
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+
+ // List of active notifications
+ print_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
+ $var=true;
+
+ // Line with titles
+ print '<table width="100%" class="noborder">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
+ print_liste_field_titre('','','');
+ print '</tr>';
+
+ $langs->load("errors");
+ $langs->load("other");
+
+ if ($num)
+ {
+ $i = 0;
$userstatic=new user($db);
@@ -314,10 +325,7 @@ if ($result > 0)
}
$db->free($resql);
}
- else
- {
- dol_print_error($db);
- }
+
// List of notifications enabled for fixed email
/*
@@ -375,20 +383,6 @@ if ($result > 0)
print '<br><br>'."\n";
- // List of notifications done
- print_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
- $var=true;
-
- // Line with titles
- print '<table width="100%" class="noborder">';
- print '<tr class="liste_titre">';
- print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
- //print_liste_field_titre($langs->trans("Object"),$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.daten",'',$param,'align="right"',$sortfield,$sortorder);
- print '</tr>';
-
// List
$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
$sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
@@ -398,11 +392,34 @@ if ($result > 0)
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
$sql.= " WHERE a.rowid = n.fk_action";
$sql.= " AND n.fk_user = ".$object->id;
-
+ $sql.= $db->order($sortfield, $sortorder);
+
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+
+ // List of notifications done
+ print_fiche_titre($langs->trans("ListOfNotificationsDone").' ('.$num.')','','');
+ $var=true;
+
+ // Line with titles
+ print '<table width="100%" class="noborder">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"n.type",'',$param,'',$sortfield,$sortorder);
+ //print_liste_field_titre($langs->trans("Object"),$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"n.daten",'',$param,'align="right"',$sortfield,$sortorder);
+ print '</tr>';
+
+ if ($num)
+ {
$i = 0;
$userstatic=new User($db);
@@ -451,10 +468,6 @@ if ($result > 0)
}
$db->free($resql);
}
- else
- {
- dol_print_error($db);
- }
print '</table>';
}
--
GitLab