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

Merged
Opened Nov 23, 2021 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

Ticket 1738

  • Discussion 1
  • Commits 232
  • Pipelines 2
  • Changes 122
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    enabled an automatic merge when the pipeline for 8c96561a succeeds

    Nov 23, 2021

    enabled an automatic merge when the pipeline for 8c96561a succeeds

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

    merged

    Nov 23, 2021

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 7fc11569

    Nov 23, 2021

    mentioned in commit 7fc11569

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

    mentioned in commit ff904c5a

    Nov 23, 2021

    mentioned in commit ff904c5a

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

    mentioned in merge request !85 (merged)

    Nov 23, 2021

    mentioned in merge request !85 (merged)

    mentioned in merge request !85
    Toggle commit list
  • François C.
    @fracolo started a discussion on commit 11d6b3ab Oct 25, 2022
    shifts/views.py
    120 120 smax = int(value['seats_available']) + int(value['seats_reserved'])
    121 121
    122 122 value['address_id'] = getattr(settings, 'COMPANY_CODE', '')
    123 title_prefix = ' - '
    123 title_prefix = ''
    124 124 if len(value['address_id']) == 2 and ',' in value['address_id'][1]:
    125 125 title_prefix = str(value['address_id'][1]).split(",")[1] + " --"
    126 126
    127 127 event["title"] = title_prefix + str(value['seats_reserved']) + "/" + str(smax)
    128 128
    129
    129 130 event["start"] = dateIsoUTC(value['date_begin_tz'])
    130 event["end"] = dateIsoUTC(value['date_end_tz'])
    131
    132 datetime_object = datetime.datetime.strptime(value['date_end_tz'], "%Y-%m-%d %H:%M:%S") - datetime.timedelta(minutes=15)
    • François C. @fracolo commented Oct 25, 2022
      Master

      https://redmine.cooperatic.fr/issues/1680

      https://redmine.cooperatic.fr/issues/1680
    Please register or sign in to reply
  • 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!84
×

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.