Overview
Comment: | Display category name in advanced search |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA3-256: |
7cad027b39a0fd8faca513e88d0564da |
User & Date: | bohwaz on 2022-04-04 01:35:16 |
Other Links: | branch diff | manifest | tags |
Context
2022-04-04
| ||
01:44 | Add search in services check-in: 812d23f88a user: bohwaz tags: dev | |
01:35 | Display category name in advanced search check-in: 7cad027b39 user: bohwaz tags: dev | |
01:32 | Fix search clone check-in: 1cb429b5e6 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Template.php from [e987619fdc] to [ec4af548c2].
︙ | ︙ | |||
650 651 652 653 654 655 656 657 658 659 660 661 662 663 | return sprintf($out, $color1, $color2, $admin_background); } protected function displayDynamicField(array $params): string { $field = $params['field'] ?? DynamicFields::get($params['key']); $v = $params['value']; if ($field->type == 'checkbox') { return $v ? 'Oui' : 'Non'; } if (empty($v)) { return ''; | > > > > | 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 | return sprintf($out, $color1, $color2, $admin_background); } protected function displayDynamicField(array $params): string { $field = $params['field'] ?? DynamicFields::get($params['key']); $v = $params['value']; if (!$field) { return htmlspecialchars($v); } if ($field->type == 'checkbox') { return $v ? 'Oui' : 'Non'; } if (empty($v)) { return ''; |
︙ | ︙ |
Modified src/include/lib/Garradin/Users/AdvancedSearch.php from [134567b446] to [372c75cffb].
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | } $columns['id_category'] = [ 'label' => 'Catégorie', 'type' => 'enum', 'null' => false, 'values' => $db->getAssoc('SELECT id, name FROM users_categories ORDER BY name COLLATE U_NOCASE;'), ]; return $columns; } public function schema(): array { | > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | } $columns['id_category'] = [ 'label' => 'Catégorie', 'type' => 'enum', 'null' => false, 'values' => $db->getAssoc('SELECT id, name FROM users_categories ORDER BY name COLLATE U_NOCASE;'), 'select' => '(SELECT name FROM users_categories WHERE id = id_category)', 'where' => 'id_category', ]; return $columns; } public function schema(): array { |
︙ | ︙ |