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

Merged
Opened Jan 09, 2025 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

display informative modale to user, customable by admin

Edited Jan 10, 2025 by Damien Moulard
  • Discussion 2
  • Commits 4
  • Changes 16
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 1 commit

    • 7f1c5e1b - display informative modale to user, customable by admin, only 1 active at a time

    Compare with previous version

    Jan 10, 2025

    added 1 commit

    • 7f1c5e1b - display informative modale to user, customable by admin, only 1 active at a time

    Compare with previous version

    added 1 commit <ul><li>7f1c5e1b - display informative modale to user, customable by admin, only 1 active at a time</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/124/diffs?diff_id=3701&start_sha=560f9676da0b422cd9fc17d52dca031c6dcacdf5)
    Toggle commit list
  • Damien Moulard @DamienM

    unmarked as a Work In Progress

    Jan 10, 2025

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • 1d58427b - add link plugin to ckeditor

    Compare with previous version

    Jan 10, 2025

    added 1 commit

    • 1d58427b - add link plugin to ckeditor

    Compare with previous version

    added 1 commit <ul><li>1d58427b - add link plugin to ckeditor</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/124/diffs?diff_id=3702&start_sha=7f1c5e1bba6ba376a99f1926bd323fc334dbcd21)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 0320fd1c - do not try to access informationPopupData when it is null

    Compare with previous version

    Jan 13, 2025

    added 1 commit

    • 0320fd1c - do not try to access informationPopupData when it is null

    Compare with previous version

    added 1 commit <ul><li>0320fd1c - do not try to access informationPopupData when it is null</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/124/diffs?diff_id=3703&start_sha=1d58427b7e29285050c6fa146a3e765b16782f25)
    Toggle commit list
  • Yvon Kerdoncuff
    @Yvon started a discussion on the diff Jan 13, 2025
    Resolved by Damien Moulard Jan 17, 2025
    templates/themes/kohinos/common/modale_info_for_users.html.twig 0 → 100644
    1 <!-- Modal -->
    2 {% set informationPopupData = getInformationPopupData() %}
    3 <div class="modal fade" id="infoForUserModal" tabindex="-1" role="dialog" aria-labelledby="infoForUserModalTitle" aria-hidden="true">
    4 <div class="modal-dialog modal-dialog-centered" role="document">
    5 <div class="modal-content">
    6 {% if informationPopupData %}
    • Yvon Kerdoncuff @Yvon commented Jan 13, 2025
      Master

      Je propose ce fix d'un crash que j'ai eu immédiatement avant d'avoir configuré ma première popup : il s'agit de ne pas accèder aux attributs de informationPopupData s'il vaut null. Je te laisse merge si c'est OK, sinon corriger ma proposition de fix.

      Edited Jan 13, 2025 by Yvon Kerdoncuff
      Je propose ce fix d'un crash que j'ai eu immédiatement avant d'avoir configuré ma première popup : il s'agit de ne pas accèder aux attributs de informationPopupData s'il vaut null. Je te laisse merge si c'est OK, sinon corriger ma proposition de fix.
    • Damien Moulard @DamienM commented Jan 17, 2025
      Master

      bien vu ! ok pour moi je merge

      bien vu ! ok pour moi je merge
    Please register or sign in to reply
  • Damien Moulard @DamienM

    resolved all discussions

    Jan 17, 2025

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    Jan 17, 2025

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit ee6945e8

    Jan 17, 2025

    mentioned in commit ee6945e8

    mentioned in commit ee6945e84dfd6cae1a4f616265d0b82d3ac4bb5e
    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!124
×

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.