Commit 2b23b278 authored by Romain Therville's avatar Romain Therville 🐭

Update for the "Process mail demands" admin table

A new "Project space" column has been added to the admin "Process mail
demands" table.

issue #161
parent 486bbe81
......@@ -424,7 +424,7 @@ class tx_nG6_db {
$queryParts=array(
'SELECT' => 'tx_nG6_purge_demand.uid AS demand_id, `tx_nG6_purge_demand`.project_id AS project_id, tx_nG6_project.name as project_name,
`tx_nG6_purge_demand`.purge_size AS purge_size, `tx_nG6_purge_demand`.mail_sent_date, `tx_nG6_purge_demand`.demand_state,
`fe_users`.username, `fe_groups`.title AS user_group_title,
`fe_users`.username, `fe_groups`.title AS user_group_title, `tx_nG6_project`.space_id AS space_id,
DATEDIFF( now( ), FROM_UNIXTIME( `tx_nG6_purge_demand`.mail_sent_date ) ) >'.$delay_in_days.' AS delay_excedeed',
'FROM' => '`tx_nG6_purge_demand`
INNER JOIN tx_nG6_project ON tx_nG6_project.uid = tx_nG6_purge_demand.project_id
......@@ -449,6 +449,7 @@ INNER JOIN fe_groups ON fe_groups.uid = fe_users.usergroup',
"project_name"=>$res_row["project_name"],
"demand_state"=>$res_row["demand_state"],
"delay_excedeed"=>$res_row["delay_excedeed"],
"space_id"=>$res_row["space_id"],
"users"=>array(array("username"=>$res_row["username"], "user_group_title"=>$res_row["user_group_title"]))
);
}
......
......@@ -476,6 +476,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th><center><input type="checkbox" id="all_chk_demand"></center></th>
<th>Demand number</th>
<th>Project name</th>
<th>Project space</th>
<th>Purgeable size</th>
<th>Demand date</th>
<th>Users</th>
......@@ -488,7 +489,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tbody>
<tfoot>
<tr>
<th align="left" colspan="7">
<th align="left" colspan="8">
With selection :
<div class="btn-group">
<button id="btn_demand_resend_mail" type="button" class="btn btn-sm btn-default" ><i class="glyphicon glyphicon-remove"></i> Resend mail</button>
......
......@@ -516,7 +516,7 @@ $(function () {
"order": [[ 1, "asc" ]],
"columns": [
{ "orderable": false },
null,null,null,null,null,null]});
null,null,null,null,null,null,null]});
purge_table["allproject"] = $("#data_table_allproject").DataTable({});
......@@ -829,6 +829,7 @@ $(function () {
var checkbox = '<center><input id="chk_demand_"'+key+'" type="checkbox" value="' + key + '" class="chk_demand"></center>' ;
tx_nG6_pi6_redirection_page = $("#tx_nG6_pi6_redirection_page").val();
var row=[checkbox, key, "<a href='index.php?id="+tx_nG6_pi6_redirection_page+"&tx_nG6_pi1[project_id]="+values["project_id"]+"'>"+values["project_name"]+"</a>",
values["space_id"],
get_octet_string_representation(values["purge_size"],2),
values["mail_sent_date"]];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment