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
  • !168

Merged
Opened May 03, 2022 by Félicie@felicie 
  • Report abuse
Report abuse

2821-inventory-optimization

  • Discussion 2
  • Commits 4
  • Pipelines 3
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff May 03, 2022
    Last updated by Félicie May 03, 2022
    shelfs/static/js/shelf_inventory.js
    469 473 }
    470 474 }
    471 475
    472 var msg = (originView == 'shelf') ? 'Retour à la liste des rayons' : 'Retour';
    476 var msg = (originView == 'shelf') ? 'OK, je passe à la suite !' : 'Retour';
    473 477
    474 openModal(inventory_validated_msg.html(), back, msg, true, false);
    478 // Go to step 2 if step 1 is validated and modal closed
    479 openModal(inventory_validated_msg.html(), refresh, msg, true, false);
    475 480
    476 481 // Go back to list if modal closed
    477 482 $('#modal_closebtn_top').on('click', back);
    • Damien Moulard @DamienM commented May 03, 2022
      Developer

      Il faut aussi refresh au lieu de back ici et à la ligne en dessous : ces lignes sont prévues au cas où l'utilisateurice fermerait la modale d'une autre façon qu'en cliquant sur le bouton de la modale.

      Il faut aussi `refresh` au lieu de `back` ici et à la ligne en dessous : ces lignes sont prévues au cas où l'utilisateurice fermerait la modale d'une autre façon qu'en cliquant sur le bouton de la modale.
    • Félicie @felicie

      changed this line in version 2 of the diff

      May 03, 2022

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/168/diffs?diff_id=1612&start_sha=567346cc7454258e17d8bc9c8a14cb605ef1ab2d#5027bd05b7f435e2418d15fca2797014fc4bee93_482_482)
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM commented May 03, 2022
    Developer

    Je ne pense pas qu'il y a besoin d'un loading après avoir appuyé sur "Ok, je passe à la suite !", ça me semble bien comme ça !

    (Pour info, pour le faire il faudrait mettre un loading au chargement de la page directement.)

    Je ne pense pas qu'il y a besoin d'un loading après avoir appuyé sur "Ok, je passe à la suite !", ça me semble bien comme ça ! (Pour info, pour le faire il faudrait mettre un loading au chargement de la page directement.)
  • Félicie @felicie

    added 9 commits

    • 567346cc...793d102f - 7 commits from branch dev_cooperatic
    • 4716ad2b - refresh added
    • 9d0aaeff - Merge branch 'dev_cooperatic' into 2821-inventory-optimization

    Compare with previous version

    May 03, 2022

    added 9 commits

    • 567346cc...793d102f - 7 commits from branch dev_cooperatic
    • 4716ad2b - refresh added
    • 9d0aaeff - Merge branch 'dev_cooperatic' into 2821-inventory-optimization

    Compare with previous version

    added 9 commits <ul><li>567346cc...793d102f - 7 commits from branch <code>dev_cooperatic</code></li><li>4716ad2b - refresh added</li><li>9d0aaeff - Merge branch &#39;dev_cooperatic&#39; into 2821-inventory-optimization</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/168/diffs?diff_id=1612&start_sha=567346cc7454258e17d8bc9c8a14cb605ef1ab2d)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • fd3417ae - INV: fix comment

    Compare with previous version

    May 04, 2022

    added 1 commit

    • fd3417ae - INV: fix comment

    Compare with previous version

    added 1 commit <ul><li>fd3417ae - INV: fix comment</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/168/diffs?diff_id=1613&start_sha=9d0aaeffb65c3e73fdf5bfdee7e500aad74340d1)
    Toggle commit list
  • Damien Moulard @DamienM

    enabled an automatic merge when the pipeline for fd3417ae succeeds

    May 04, 2022

    enabled an automatic merge when the pipeline for fd3417ae succeeds

    enabled an automatic merge when the pipeline for fd3417ae25a7c9e4363fa74831b324e04a9e6129 succeeds
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    May 04, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 6cf814b0

    May 04, 2022

    mentioned in commit 6cf814b0

    mentioned in commit 6cf814b0e957939db9e4bfff1e6f805f1b20557b
    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!168
×

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.