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

Merged
Opened Jun 21, 2022 by Félicie@felicie 
  • Report abuse
Report abuse

alert changed

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

    added 5 commits

    • a6f73d2a...4f582f12 - 4 commits from branch dev_cooperatic
    • 18789343 - Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode

    Compare with previous version

    Jun 21, 2022

    added 5 commits

    • a6f73d2a...4f582f12 - 4 commits from branch dev_cooperatic
    • 18789343 - Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode

    Compare with previous version

    added 5 commits <ul><li>a6f73d2a...4f582f12 - 4 commits from branch <code>dev_cooperatic</code></li><li>18789343 - Merge branch &#39;dev_cooperatic&#39; into 3292-alert-message-barrecode</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/183/diffs?diff_id=1704&start_sha=a6f73d2a620ca91d1055efb6cb4cc1db8b81ebf7)
    Toggle commit list
  • Félicie @felicie

    added 1 commit

    • be9db336 - message added

    Compare with previous version

    Jun 21, 2022

    added 1 commit

    • be9db336 - message added

    Compare with previous version

    added 1 commit <ul><li>be9db336 - message added</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/183/diffs?diff_id=1706&start_sha=1878934342d4da5737c32c36ff84ee83acf95f37)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on the diff Jun 23, 2022
    Resolved by Damien Moulard Jun 24, 2022
    shelfs/static/js/shelfs_admin.js
    479 475 else if (typeof rData.res.msg != "undefined")
    480 476 msg = rData.res.msg;
    481 477 alert(msg);
    482 main_content.find('button.add-products').html(add_pdts_btn_text);
    • Damien Moulard @DamienM commented Jun 23, 2022
      Developer

      ? Le but était de restaurer le contenu du bouton en cas d'erreur.

      ? Le but était de restaurer le contenu du bouton en cas d'erreur.
    • Damien Moulard @DamienM commented Jun 23, 2022
      Developer

      peut-être qu'il serait plus simple de masquer/afficher les éléments, si c'est compliqué de restaurer le bouton en l'état ?

      Edited Jun 23, 2022 by Damien Moulard
      peut-être qu'il serait plus simple de masquer/afficher les éléments, si c'est compliqué de restaurer le bouton en l'état ?
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Jun 23, 2022
    Resolved by Damien Moulard Jun 24, 2022
    templates/shelfs/admin.html
    70 70
    71 71 </tbody>
    72 72 </table>
    73 <button type="button" class="btn--primary add-products"></button>
    73 <div class ="add-products">
    74 <p>
    75 VOUS POUVEZ AJOUTER PLUSIEURS PRODUITS A LA FOIS AVANT DE VALIDER
    76 </p>
    77 <button type="button" class="btn--primary">AJOUTER LES PRODUITS AU RAYON</button>
    • Damien Moulard @DamienM commented Jun 23, 2022
      Developer

      Tout en caps lock ça donne un peu l'impression qu'on engueule les coops haha, peut-être qu'on peut écrire normalement à l'interieur du bouton

      Tout en caps lock ça donne un peu l'impression qu'on engueule les coops haha, peut-être qu'on peut écrire normalement à l'interieur du bouton
    • Félicie @felicie

      changed this line in version 5 of the diff

      Jun 23, 2022

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/183/diffs?diff_id=1709&start_sha=c4f658a574d319b6e3c7248b2ecc22283328a519#2b2cde333a3eaa8919068f6d07200f33b1483999_77_77)
      Toggle commit list
    Please register or sign in to reply
  • Félicie @felicie

    added 4 commits

    • be9db336...5916f6b2 - 3 commits from branch dev_cooperatic
    • c4f658a5 - Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode

    Compare with previous version

    Jun 23, 2022

    added 4 commits

    • be9db336...5916f6b2 - 3 commits from branch dev_cooperatic
    • c4f658a5 - Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode

    Compare with previous version

    added 4 commits <ul><li>be9db336...5916f6b2 - 3 commits from branch <code>dev_cooperatic</code></li><li>c4f658a5 - Merge branch &#39;dev_cooperatic&#39; into 3292-alert-message-barrecode</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/183/diffs?diff_id=1707&start_sha=be9db33684b698244eaecc00fb29529c7ac4dee0)
    Toggle commit list
  • Félicie @felicie

    added 1 commit

    • 9e0f8ad0 - changed

    Compare with previous version

    Jun 23, 2022

    added 1 commit

    • 9e0f8ad0 - changed

    Compare with previous version

    added 1 commit <ul><li>9e0f8ad0 - changed</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/183/diffs?diff_id=1709&start_sha=c4f658a574d319b6e3c7248b2ecc22283328a519)
    Toggle commit list
  • Damien Moulard @DamienM

    resolved all discussions

    Jun 24, 2022

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • 453c21a0 - fix loading on shelf admin add products

    Compare with previous version

    Jun 24, 2022

    added 1 commit

    • 453c21a0 - fix loading on shelf admin add products

    Compare with previous version

    added 1 commit <ul><li>453c21a0 - fix loading on shelf admin add products</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/183/diffs?diff_id=1712&start_sha=9e0f8ad035b0a6b4bdf2ea79dc4b8b8a2a7fa563)
    Toggle commit list
  • Félicie @felicie

    merged

    Jun 24, 2022

    merged

    merged
    Toggle commit list
  • Félicie @felicie

    mentioned in commit 4159459d

    Jun 24, 2022

    mentioned in commit 4159459d

    mentioned in commit 4159459d3fb475461733754115de5981ffdf478e
    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!183
×

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.