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 2
    • Merge Requests 2
  • 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
  • !284

Merged
Opened Mar 14, 2025 by Yvon Kerdoncuff@Yvon 
  • Report abuse
Report abuse

several changes in inventaire par article app

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b 7747-inventaire-par-article origin/7747-inventaire-par-article

Step 2. Review the changes locally

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

git checkout migration-v12
git merge --no-ff 7747-inventaire-par-article

Step 4. Push the result of the merge to GitLab

git push origin migration-v12

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 3
  • Pipelines 3
  • Changes 9
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 70860307 - entirely rework inventaire par produits app

    Compare with previous version

    Mar 18, 2025

    added 1 commit

    • 70860307 - entirely rework inventaire par produits app

    Compare with previous version

    added 1 commit <ul><li>70860307 - entirely rework inventaire par produits app</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/284/diffs?diff_id=3943&start_sha=abe34fb627b7153d9272337dfd4315dd1a7f129c)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 2123aa7b - in order and product apps, remove accent before performing datatable search

    Compare with previous version

    Mar 18, 2025

    added 1 commit

    • 2123aa7b - in order and product apps, remove accent before performing datatable search

    Compare with previous version

    added 1 commit <ul><li>2123aa7b - in order and product apps, remove accent before performing datatable search</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/284/diffs?diff_id=3944&start_sha=7086030799dc6251c5f6fb701473256f02ffbe6b)
    Toggle commit list
  • François C.
    @fracolo started a discussion on the diff Mar 19, 2025
    Last updated by Yvon Kerdoncuff Mar 19, 2025
    products/static/js/products_index.js
    216 url: "/products/get_product_data?barcode=" + barcode,
    177 url: "/products/get_all_active_products",
    217 178 success: function(data) {
    218 reset_focus();
    219
    220 if (data.product.active == false) {
    221 alert('Ce produit est archivé !');
    222
    223 return 0;
    224 }
    225
    226 add_product(data.product);
    179 init(data.products)
    180 closeModal();
    181 // Attendre que le DOM soit complètement prêt avant de donner le focus
    182 setTimeout(function() {
    • François C. @fracolo commented Mar 19, 2025
      Master

      Invoquer la fonction .ready() sur l'élément de DOM correspondant à la table (ou une fonction équivalente de datatable) permettrait de ne pas avoir un mettre un mettre un temps d'attente arbitraire.

      Invoquer la fonction .ready() sur l'élément de DOM correspondant à la table (ou une fonction équivalente de datatable) permettrait de ne pas avoir un mettre un mettre un temps d'attente arbitraire.
    • Yvon Kerdoncuff @Yvon commented Mar 19, 2025
      Master

      merci pour le feedback

      merci pour le feedback
    Please register or sign in to reply
  • François C. @fracolo

    mentioned in commit f2dff3c8

    Mar 19, 2025

    mentioned in commit f2dff3c8

    mentioned in commit f2dff3c86be51b647914d030fae0e98d7dfed755
    Toggle commit list
  • François C. @fracolo

    merged

    Mar 19, 2025

    merged

    merged
    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!284
×

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.