Overview
Comment:Temporary fix for action
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA3-256: 690b6ab9427067eb5c1bc6ec3c4dd7538614040cf1c2ae30c2f363882a495118
User & Date: bohwaz on 2022-09-17 12:13:18
Other Links: branch diff | manifest | tags
Context
2022-09-27
01:09
Allow multiple subscriptions to the same activity the same day, if the fee is different as well check-in: b33097fa7a user: bohwaz tags: dev
2022-09-17
12:13
Temporary fix for action check-in: 690b6ab942 user: bohwaz tags: dev
11:57
Fix deprecated stuff check-in: a00bddb4d7 user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Users/DynamicFields.php from [1c24d7711c] to [5cf9cf46cf].

61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
	}

	static public function getFirstEmailField(): string
	{
		return key(self::getInstance()->fieldsByType('email'));
	}

	/**
	 * FIXME use generated columns instead https://www.sqlite.org/gencol.html
	 */
	static public function getNumberField(): string
	{
		return key(self::getInstance()->fieldsBySystemUse('number'));
	}

	static public function getLoginField(): string
	{







<
<
<







61
62
63
64
65
66
67



68
69
70
71
72
73
74
	}

	static public function getFirstEmailField(): string
	{
		return key(self::getInstance()->fieldsByType('email'));
	}




	static public function getNumberField(): string
	{
		return key(self::getInstance()->fieldsBySystemUse('number'));
	}

	static public function getLoginField(): string
	{

Modified src/www/admin/users/action.php from [f19e35588b] to [92fe391873].

1
2
3
4


5
6
7
8
9
10
11
<?php
namespace Garradin;

use Garradin\Users\Categories;



require_once __DIR__ . '/_inc.php';

$session->requireAccess($session::SECTION_USERS, $session::ACCESS_ADMIN);

if (!f('selected') || !is_array(f('selected')) || !count(f('selected')))
{




>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
<?php
namespace Garradin;

use Garradin\Users\Categories;

die('en cours'); // FIXME

require_once __DIR__ . '/_inc.php';

$session->requireAccess($session::SECTION_USERS, $session::ACCESS_ADMIN);

if (!f('selected') || !is_array(f('selected')) || !count(f('selected')))
{
82
83
84
85
86
87
88
89
if ($action == 'move')
{
    $tpl->assign('membres_cats', Categories::listSimple());
}

$tpl->assign('action', $action);

$tpl->display('admin/membres/action.tpl');







|
84
85
86
87
88
89
90
91
if ($action == 'move')
{
    $tpl->assign('membres_cats', Categories::listSimple());
}

$tpl->assign('action', $action);

$tpl->display('admin/users/action.tpl');