haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-15 13:43:36 +00:00
Code Issues Releases Wiki Activity

fix edit wiki url (#6085)

Browse Source
This commit is contained in:
JoinTyang 2024-05-16 09:58:18 +08:00 committed by GitHub
parent 5ece5934ea
commit b8e490d594
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/wiki-list-view/wiki-list-item.js
View File

@ -72,7 +72,7 @@ class WikiListItem extends Component {
let fileIconUrl = Utils.getDefaultLibIconUrl(false); let fileIconUrl = Utils.getDefaultLibIconUrl(false);
let isOldVersion = wiki.version !== 'v2'; let isOldVersion = wiki.version !== 'v2';
let publishedUrl = `${siteRoot}published/${encodeURIComponent(wiki.slug)}/`; let publishedUrl = `${siteRoot}published/${encodeURIComponent(wiki.slug)}/`;
let editUrl = `${siteRoot}edit-wiki/${wiki.id}/`; let editUrl = `${siteRoot}wikis/${wiki.id}/`;
const desktopItem = ( const desktopItem = (
<tr <tr

2
frontend/src/pages/wiki2/index.js
View File

@ -74,7 +74,7 @@ class Wiki extends Component {
} }
handlePath = () => { handlePath = () => {
return isEditWiki ? 'edit-wiki/' : 'published/'; return isEditWiki ? 'wikis/' : 'published/';
}; };
getWikiConfig = () => { getWikiConfig = () => {

2
frontend/src/pages/wiki2/wiki-left-bar/wiki-left-bar.js
View File

@ -22,7 +22,7 @@ export default class WikiLeftBar extends React.Component {
} }
openPreviewApp = () => { openPreviewApp = () => {
window.open(window.location.href.replace('/edit-wiki/', '/published/')); window.open(window.location.href.replace('/wikis/', '/published/'));
}; };
openAppSettingsDialog = () => { openAppSettingsDialog = () => {

4
seahub/urls.py
View File

@ -203,7 +203,7 @@ from seahub.ocm.settings import OCM_ENDPOINT
from seahub.ai.apis import LibrarySdocIndexes, Search, LibrarySdocIndex, TaskStatus, \ from seahub.ai.apis import LibrarySdocIndexes, Search, LibrarySdocIndex, TaskStatus, \
LibraryIndexState, QuestionAnsweringSearchInLibrary, FileDownloadToken LibraryIndexState, QuestionAnsweringSearchInLibrary, FileDownloadToken
from seahub.wiki2.views import edit_wiki from seahub.wiki2.views import wiki_view
from seahub.api2.endpoints.wiki2 import Wikis2View, Wiki2View, Wiki2ConfigView, Wiki2PagesDirView, Wiki2PageContentView from seahub.api2.endpoints.wiki2 import Wikis2View, Wiki2View, Wiki2ConfigView, Wiki2PagesDirView, Wiki2PageContentView
urlpatterns = [ urlpatterns = [
@ -706,7 +706,7 @@ urlpatterns = [
re_path(r'^api/v2.1/admin/invitations/$', AdminInvitations.as_view(), name='api-v2.1-admin-invitations'), re_path(r'^api/v2.1/admin/invitations/$', AdminInvitations.as_view(), name='api-v2.1-admin-invitations'),
re_path(r'^api/v2.1/admin/invitations/(?P<token>[a-f0-9]{32})/$', AdminInvitation.as_view(), name='api-v2.1-admin-invitation'), re_path(r'^api/v2.1/admin/invitations/(?P<token>[a-f0-9]{32})/$', AdminInvitation.as_view(), name='api-v2.1-admin-invitation'),
re_path(r'^edit-wiki/(?P<wiki_id>[^/]+)/(?P<file_path>.*)$', edit_wiki, name='edit_wiki'), re_path(r'^wikis/(?P<wiki_id>[^/]+)/(?P<file_path>.*)$', wiki_view, name='wiki'),
path('avatar/', include('seahub.avatar.urls')), path('avatar/', include('seahub.avatar.urls')),
path('notice/', include('seahub.notifications.urls')), path('notice/', include('seahub.notifications.urls')),

2
seahub/wiki2/views.py
View File

@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
@login_required @login_required
def edit_wiki(request, wiki_id, file_path): def wiki_view(request, wiki_id, file_path):
""" edit wiki page. for wiki2 """ edit wiki page. for wiki2
""" """
# get wiki object or 404 # get wiki object or 404