Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for saving designer page with already existing names #15770

Merged
merged 1 commit into from
Jan 12, 2020
Merged

Fix for saving designer page with already existing names #15770

merged 1 commit into from
Jan 12, 2020

Conversation

tabraiz961
Copy link
Contributor

Fix for saving designer page with already existing names

Fixes #15432

@williamdes williamdes changed the title Signed-off-by: Tabraiz Malik<tabraizmalik96@gmail.com> Fix for saving designer page with already existing names Jan 9, 2020
@codecov

This comment has been minimized.

Sign in to view
@tabraiz961
Copy link
Contributor Author

@williamdes Did i miss something cause i am seeing this error

No coverage uploaded for pull request base (QA_5_0@d01dab8)

@williamdes
Copy link
Member

@tabraiz961 nevermind, this is not important in your case
I will review the PR as soon as possible

@tabraiz961
Copy link
Contributor Author

hi @williamdes is the Codacy/PR Quality Review something to worry about? I have provided Codacy permission from my github settings still it is unable to review the pull request.

williamdes
williamdes reviewed Jan 10, 2020
View reviewed changes
db_designer.php Outdated Show resolved Hide resolved
@williamdes
Copy link
Member

No problem for codacy, you can ignore it
But be sure travis CI passes (except Google Chrome tests)

@williamdes
Copy link
Member

williamdes commented Jan 12, 2020 •
edited
Loading

@tabraiz961 please do git reset --hard 9f892b561d6b55d6690510038cf52f1f01645679
And git push --force
That is an inconvenience when using the main QA_5_0 branch for a PR
I will try to merge it soon
Thank you

@tabraiz961
Copy link
Contributor Author

tabraiz961 commented Jan 12, 2020 •
edited
Loading

Hi @williamdes Thank you so much i was scratching my head here keep up the good work

@tabraiz961 please do git reset --hard 9f892b561d6b55d6690510038cf52f1f01645679
And git push --force
That is an inconvenience when using the main QA_5_0 branch for a PR
I will try to merge it soon
Thank you

@williamdes
Copy link
Member

Hi @tabraiz961 did you succeed to fix it ?
I can do it on my end if you want, I prefer that you do it so you are able to fix it next time ;)

@tabraiz961
Copy link
Contributor Author

Hi @tabraiz961 did you succeed to fix it ?
I can do it on my end if you want, I prefer that you do it so you are able to fix it next time ;)

I changed my email once after commiting, i am reverting it. That was causing the signoff failure :(

@williamdes
Copy link
Member

@tabraiz961 I have forced DCO to pass since your email is not an issue.

@tabraiz961 @williamdes
Fix for page name already existing in designer page names
c6206a3 
Signed-off-by: Tabraiz Malik <tabraizmalik96@gmail.com>
@williamdes
Copy link
Member

Waiting for CI tests and lint to pass

@williamdes williamdes self-assigned this Jan 12, 2020
@williamdes williamdes added this to the 5.0.2 milestone Jan 12, 2020
williamdes added a commit that referenced this pull request Jan 12, 2020
@williamdes
Merge #15770 - Fix #15432 names of the pages in the designer should b…
01b9881 
…e unique

Pull-request: #15770
Fixes: #15432
Signed-off-by: William Desportes <williamdes@wdes.fr>
@williamdes williamdes merged commit c6206a3 into phpmyadmin:QA_5_0 Jan 12, 2020
@williamdes
Copy link
Member

Merged, thank you for your contribution !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williamdes williamdes williamdes approved these changes

Assignees

@williamdes williamdes

Labels
None yet
Projects
None yet
Milestone
5.0.2
Development

Successfully merging this pull request may close these issues.
2 participants
@tabraiz961 @williamdes