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.

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

Fixed bugs on Wiki and resolved #667 #674

Merged
merged 1 commit into from
Jan 21, 2017
Merged

Conversation

lunny
Copy link
Member

@lunny lunny commented Jan 15, 2017

The previous version didn't diff wiki title and wiki page path. This PR will diff them clearly in variable names.

@lunny lunny added the type/bug label Jan 15, 2017
@lunny lunny added this to the 1.1.0 milestone Jan 15, 2017
@@ -89,7 +89,7 @@ func discardLocalWikiChanges(localPath string) error {
}

// updateWikiPage adds new page to repository wiki.
func (repo *Repository) updateWikiPage(doer *User, oldTitle, title, content, message string, isNew bool) (err error) {
func (repo *Repository) updateWikiPage(doer *User, oldWikiPath, wikiPath, content, message string, isNew bool) (err error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete wiki by path not the title. we have to give the real meaning of the variables.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But now wikiPath contains the title of the page and not the /path/to/wiki/page

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. wikiPath will not contain title. See AddWikiPage and EditWikiPage which will call the function.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I see, I created single word wiki pages. When you do that it looks like title == wikiPath

@lunny lunny mentioned this pull request Jan 20, 2017
6 tasks
@bkcsoft
Copy link
Member

bkcsoft commented Jan 21, 2017

I've looked through it, didn't see any errors 🎉
If you've tested this you have my LGTM 😄

@tboerger tboerger added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 21, 2017
@Bwko
Copy link
Member

Bwko commented Jan 21, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 21, 2017
@lunny lunny merged commit f8c2903 into go-gitea:master Jan 21, 2017
@lunny lunny deleted the lunny/fix_wiki branch February 16, 2017 03:27
lunny added a commit to lunny/gitea that referenced this pull request Feb 16, 2017
lunny added a commit that referenced this pull request Feb 16, 2017
@lunny lunny added the backport/done All backports for this PR have been created label Feb 16, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants