Commit 8cbea4c7 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Bug 1606094: Stop sending quota notifications to everyone"

parents a083558a 2c262cdf
...@@ -796,13 +796,12 @@ function institution_submit(Pieform $form, $values) { ...@@ -796,13 +796,12 @@ function institution_submit(Pieform $form, $values) {
); );
// get all the users from the institution and make sure that they are still below // get all the users from the institution and make sure that they are still below
// their quota threshold // their quota threshold
if ($users = get_records_sql_array('SELECT * FROM {usr} u LEFT JOIN {usr_institution} ui ON u.id = ui.usr AND ui.institution = ?', array($institution))) { if ($users = get_records_sql_array('SELECT * FROM {usr} u INNER JOIN {usr_institution} ui ON u.id = ui.usr AND ui.institution = ?', array($institution))) {
$quotanotifylimit = get_config_plugin('artefact', 'file', 'quotanotifylimit'); $quotanotifylimit = get_config_plugin('artefact', 'file', 'quotanotifylimit');
if ($quotanotifylimit <= 0 || $quotanotifylimit >= 100) { if ($quotanotifylimit <= 0 || $quotanotifylimit >= 100) {
$quotanotifylimit = 100; $quotanotifylimit = 100;
} }
foreach ($users as $user) { foreach ($users as $user) {
$user->quota = $values['defaultquota'];
// check if the user has gone over the quota notify limit // check if the user has gone over the quota notify limit
$user->quotausedpercent = $user->quotaused / $user->quota * 100; $user->quotausedpercent = $user->quotaused / $user->quota * 100;
$overlimit = false; $overlimit = false;
......
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