Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !403 opened Dec 17, 2018 by Chif Gergő@chif.gergo 
  • Report abuse
Report abuse

Trans input fix

The fix of modal transfer ownership input field focus bug.

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b trans_input_fix origin/trans_input_fix

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff trans_input_fix

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 3
  • Commits 5
  • Pipelines 3
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Belákovics Ádám
    @Edi started a discussion on the diff Feb 18, 2019
    Last updated by Chif Gergő Feb 21, 2019
    circle/dashboard/views/util.py
    682 682 messages.error(request, _('This token is invalid or has expired.'))
    683 683 raise PermissionDenied()
    684 684 return render(request, self.template,
    685 dictionary={'instance': instance, 'key': key})
    685 {'instance': instance, 'key': key})
    • Belákovics Ádám @Edi commented Feb 18, 2019
      Master

      Can you describe why was this change necessary?

      Can you describe why was this change necessary?
    • Chif Gergő @chif.gergo commented Feb 21, 2019
      Developer

      The render method doesn't have keyword dictionaryScreenshot_2019-02-21_15-27-56

      The render method doesn't have keyword dictionary![Screenshot_2019-02-21_15-27-56](/uploads/ba7ced5534830ab2bb01288dd7f81786/Screenshot_2019-02-21_15-27-56.png)
    Please register or sign in to reply
  • Belákovics Ádám @Edi commented Feb 18, 2019
    Master

    As I understand this modal focus bug is the problem of bootstrap. Wouldn't it be more reasonable to solve this bug globally? This might be a solution: https://github.com/sweetalert2/sweetalert2/issues/374#issuecomment-357459577 And the problem is further discussed here: https://github.com/twbs/bootstrap/issues/19850

    What do you think?

    As I understand this modal focus bug is the problem of bootstrap. Wouldn't it be more reasonable to solve this bug globally? This might be a solution: https://github.com/sweetalert2/sweetalert2/issues/374#issuecomment-357459577 And the problem is further discussed here: https://github.com/twbs/bootstrap/issues/19850 What do you think?
  • Chif Gergő @chif.gergo

    added 2 commits

    • e480328f - dashboard: Fix the modal input focus bug
    • 0e085c30 - Merge branch 'trans_input_fix' of https://git.ik.bme.hu/circle/cloud into trans_input_fix

    Compare with previous version

    Feb 25, 2019

    added 2 commits

    • e480328f - dashboard: Fix the modal input focus bug
    • 0e085c30 - Merge branch 'trans_input_fix' of https://git.ik.bme.hu/circle/cloud into trans_input_fix

    Compare with previous version

    added 2 commits * e480328f - dashboard: Fix the modal input focus bug * 0e085c30 - Merge branch 'trans_input_fix' of https://git.ik.bme.hu/circle/cloud into trans_input_fix [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/403/diffs?diff_id=726&start_sha=9a62c97499647fd3c23ca5f2c1f4c996353a1f41)
    Toggle commit list
  • Belákovics Ádám @Edi

    merged

    Feb 27, 2019

    merged

    merged
    Toggle commit list
  • Belákovics Ádám @Edi

    mentioned in commit b9a4bf38

    Feb 27, 2019

    mentioned in commit b9a4bf38

    mentioned in commit b9a4bf3828cce86cddda324b9ebe7e570d746699
    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
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: circle/cloud!403
×

Revert this merge request

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.