Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • 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
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !201

Merged
Opened Oct 06, 2022 by Félicie@felicie 
  • Report abuse
Report abuse

3867-ratio-button-binome-option

  • Discussion 4
  • Commits 4
  • Pipelines 3
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Félicie @felicie

    added 5 commits

    • f54ca15d...04f149b4 - 4 commits from branch dev_cooperatic
    • 290dc9f7 - Merge branch 'dev_cooperatic' into 3867-ratio-button-binome-option

    Compare with previous version

    Oct 06, 2022

    added 5 commits

    • f54ca15d...04f149b4 - 4 commits from branch dev_cooperatic
    • 290dc9f7 - Merge branch 'dev_cooperatic' into 3867-ratio-button-binome-option

    Compare with previous version

    added 5 commits <ul><li>f54ca15d...04f149b4 - 4 commits from branch <code>dev_cooperatic</code></li><li>290dc9f7 - Merge branch &#39;dev_cooperatic&#39; into 3867-ratio-button-binome-option</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/201/diffs?diff_id=1821&start_sha=f54ca15dceb99651c02ea821c2d48141feb07d59)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Oct 06, 2022
    Resolved by Damien Moulard Oct 06, 2022
    members/static/js/inscriptions.js
    279 296 ($(active_asso_area[0]).attr('id') === "existing_member_choice" && $('#existing_member_choice_action .chosen_associate div.member').length > 0)
    280 297 ) {
    281 298 associated_data_ok = true;
    299 } else if ($(active_asso_area[0]).attr('id') === "") {
    300 associated_data_ok = false;
    301 errors.push("Un des deux choix doit être sélectionné");
    282 302 }
    283 303 if (associated_data_ok === false) errors.push("Le membre 'titulaire' du binôme n'est pas défini");
    284 304 }
    285 305
    306 console.log($(active_asso_area[0]).attr('id'))
    • Damien Moulard @DamienM commented Oct 06, 2022
      Developer

      oupsi !

      oupsi !
    • Félicie @felicie

      changed this line in version 3 of the diff

      Oct 06, 2022

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/201/diffs?diff_id=1824&start_sha=290dc9f7d4e90f8198578ba57f170fcaee85087c#1795350ff5deaadad487b2aa47f2800b45807dfa_306_305)
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on the diff Oct 06, 2022
    Resolved by Félicie Oct 06, 2022
    members/static/js/inscriptions.js
    279 296 ($(active_asso_area[0]).attr('id') === "existing_member_choice" && $('#existing_member_choice_action .chosen_associate div.member').length > 0)
    280 297 ) {
    281 298 associated_data_ok = true;
    299 } else if ($(active_asso_area[0]).attr('id') === "") {
    300 associated_data_ok = false;
    301 errors.push("Un des deux choix doit être sélectionné");
    • Damien Moulard @DamienM commented Oct 06, 2022
      Developer

      Ce message est trop vague. Peut-être "Un des deux choix concernant la mise en binôme doit être sélectionné"?

      Edited Oct 06, 2022
      Ce message est trop vague. Peut-être "Un des deux choix concernant la mise en binôme doit être sélectionné"?
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Oct 06, 2022
    Resolved by Damien Moulard Oct 06, 2022
    members/static/js/inscriptions.js
    268 270 }
    269 271 }
    270 272
    273 if (associated_area_actived.show()) {
    • Damien Moulard @DamienM commented Oct 06, 2022
      Developer

      Cette ligne ne va pas. Tu lances une action dans le if. Ça a pour effet que si je met Non puis clique sur Valider, ça affiche le formulaire (et inversement). Ici, il faut juste vérifier si le formulaire est affiché (ce qui était fait avant ligne 615 : if ($('#associate_area').is(':visible')))

      Cette ligne ne va pas. Tu lances une action dans le if. Ça a pour effet que si je met Non puis clique sur Valider, ça affiche le formulaire (et inversement). Ici, il faut juste vérifier si le formulaire est affiché (ce qui était fait avant ligne 615 : `if ($('#associate_area').is(':visible'))`)
    • Félicie @felicie commented Oct 06, 2022
      Developer

      Ah oui, je vois ! Je corrige de suite !

      Ah oui, je vois ! Je corrige de suite !
    • Félicie @felicie

      changed this line in version 3 of the diff

      Oct 06, 2022

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/201/diffs?diff_id=1824&start_sha=290dc9f7d4e90f8198578ba57f170fcaee85087c#1795350ff5deaadad487b2aa47f2800b45807dfa_273_272)
      Toggle commit list
    Please register or sign in to reply
  • Félicie @felicie

    added 2 commits

    • dd069f5d - console removed
    • 862824e7 - updated

    Compare with previous version

    Oct 06, 2022

    added 2 commits

    • dd069f5d - console removed
    • 862824e7 - updated

    Compare with previous version

    added 2 commits <ul><li>dd069f5d - console removed</li><li>862824e7 - updated</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/201/diffs?diff_id=1824&start_sha=290dc9f7d4e90f8198578ba57f170fcaee85087c)
    Toggle commit list
  • Félicie @felicie

    resolved all discussions

    Oct 06, 2022

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    Oct 07, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 71e4b8bb

    Oct 07, 2022

    mentioned in commit 71e4b8bb

    mentioned in commit 71e4b8bb145c9a5912713df9fb64708367f9d086
    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: cooperatic-foodcoops/third-party!201
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.