Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !102

Closed
Opened May 21, 2024 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

admin filter flux by adherent subterritory

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b 6342-territory-filter-in-flux-menus origin/6342-territory-filter-in-flux-menus

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout develop
git merge --no-ff 6342-territory-filter-in-flux-menus

Step 4. Push the result of the merge to GitLab

git push origin develop

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 2
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Yvon Kerdoncuff
    @Yvon started a discussion on an old version of the diff May 22, 2024
    Last updated by Damien Moulard May 30, 2024
    src/Admin/FluxAdmin.php
    172 174 'label' => 'Date',
    173 175 ])
    174 176 ;
    177
    178 if($this->getConfigurationPool()->getContainer()->getParameter('household_based_allowance')) {
    179 $datagridMapper->add('territory', CallbackFilter::class, [
    180 'callback' => [$this, 'getTerritoryFilter'],
    181 'field_type' => SChoiceType::class,
    182 'label' => 'Territoire de l\'adhérent',
    183 'show_filter' => true,
    184 'advanced_filter' => false,
    185 'field_options' => [
    186 'choice_label' => $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Subterritory::class)->findAll(),
    187 'choices' => $st
    • Yvon Kerdoncuff @Yvon commented May 22, 2024
      Master

      image

      ![image](/uploads/d7cd02cd93fbbb2bb68e252d7bd6fdca/image.png)
    • Damien Moulard @DamienM

      changed this line in version 2 of the diff

      May 30, 2024

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/102/diffs?diff_id=3106&start_sha=61d77d241fc0581aee68891eb56d4ea1d635c5b5#f5415cee2337be0c63c96442bd411f568846aef4_187_186)
      Toggle commit list
    • Damien Moulard @DamienM commented May 30, 2024
      Master

      bah oui qu'est-ce que j'ai foutu... en tous cas réglé

      bah oui qu'est-ce que j'ai foutu... en tous cas réglé
    Please register or sign in to reply
  • Damien Moulard @DamienM

    added 1 commit

    • 0793b760 - fix code typo

    Compare with previous version

    May 30, 2024

    added 1 commit

    • 0793b760 - fix code typo

    Compare with previous version

    added 1 commit <ul><li>0793b760 - fix code typo</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/102/diffs?diff_id=3106&start_sha=61d77d241fc0581aee68891eb56d4ea1d635c5b5)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    closed

    Jun 03, 2024

    closed

    closed
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: agplv3/kohinos-tav!102