Overview
Comment:Fix send mass message using custom search
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: ac7e2be8ca30b7c6da8488066db342031c7b8f4f
User & Date: bohwaz on 2020-12-05 14:02:45
Other Links: branch diff | manifest | tags
Context
2020-12-05
14:08
iterable doesn't include \stdClass sadly, fix check-in: eba7bd3cf5 user: bohwaz tags: dev
14:02
Fix send mass message using custom search check-in: ac7e2be8ca user: bohwaz tags: dev
13:19
Allow opening balance from non-existent year check-in: a9c0870ccc user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Recherche.php from [c748f37f3f] to [5f2af851fc].

146
147
148
149
150
151
152

153
154
155
156
157
158
159
160
		if (!$search)
		{
			return false;
		}

		if ($search->type == self::TYPE_JSON)
		{

			$search->contenu = $this->buildQuery($search->cible, $search->query, $search->order, $search->desc, $no_limit ? 10000 : $search->limit);
		}

		return $this->searchSQL($search->cible, $search->contenu, $force_select, $no_limit);
	}

	public function getResultHeader(string $target, array $result)
	{







>
|







146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
		if (!$search)
		{
			return false;
		}

		if ($search->type == self::TYPE_JSON)
		{
			$query = $search->query;
			$search->contenu = $this->buildQuery($search->cible, $query->query, $query->order, $query->desc, $no_limit ? 10000 : $query->limit);
		}

		return $this->searchSQL($search->cible, $search->contenu, $force_select, $no_limit);
	}

	public function getResultHeader(string $target, array $result)
	{

Modified src/www/admin/membres/message_collectif.php from [41976be460] to [b187670977].

28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
            catch (UserException $e) {
                $form->addError($e->getMessage());
            }
        }

        if (isset($recipients) && !count($recipients))
        {
            $form->addError('Aucun membre dans la liste.');
        }
    }
    else
    {
        $form->addErrror('Destinataires invalides : ' . f('recipients'));
    }








|







28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
            catch (UserException $e) {
                $form->addError($e->getMessage());
            }
        }

        if (isset($recipients) && !count($recipients))
        {
            $form->addError('La liste de destinataires sélectionnée ne comporte aucun membre, ou aucun avec une adresse e-mail renseignée.');
        }
    }
    else
    {
        $form->addErrror('Destinataires invalides : ' . f('recipients'));
    }