diff --git a/trac/admin/tests/console-tests.txt b/trac/admin/tests/console-tests.txt index 270c699..099efd8 100644 --- a/trac/admin/tests/console-tests.txt +++ b/trac/admin/tests/console-tests.txt @@ -114,7 +114,7 @@ Available actions: SEARCH_VIEW, TICKET_ADMIN, TICKET_APPEND, TICKET_CHGPROP, TICKET_CREATE, TICKET_EDIT_CC, TICKET_EDIT_COMMENT, TICKET_EDIT_DESCRIPTION, TICKET_MODIFY, TICKET_VIEW, TIMELINE_VIEW, TRAC_ADMIN, WIKI_ADMIN, - WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_VIEW + WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_RENAME, WIKI_VIEW ===== test_permission_add_one_action_ok ===== @@ -148,7 +148,7 @@ Available actions: SEARCH_VIEW, TICKET_ADMIN, TICKET_APPEND, TICKET_CHGPROP, TICKET_CREATE, TICKET_EDIT_CC, TICKET_EDIT_COMMENT, TICKET_EDIT_DESCRIPTION, TICKET_MODIFY, TICKET_VIEW, TIMELINE_VIEW, TRAC_ADMIN, WIKI_ADMIN, - WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_VIEW + WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_RENAME, WIKI_VIEW ===== test_permission_add_multiple_actions_ok ===== @@ -183,7 +183,7 @@ Available actions: SEARCH_VIEW, TICKET_ADMIN, TICKET_APPEND, TICKET_CHGPROP, TICKET_CREATE, TICKET_EDIT_CC, TICKET_EDIT_COMMENT, TICKET_EDIT_DESCRIPTION, TICKET_MODIFY, TICKET_VIEW, TIMELINE_VIEW, TRAC_ADMIN, WIKI_ADMIN, - WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_VIEW + WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_RENAME, WIKI_VIEW ===== test_permission_remove_one_action_ok ===== @@ -216,7 +216,7 @@ Available actions: SEARCH_VIEW, TICKET_ADMIN, TICKET_APPEND, TICKET_CHGPROP, TICKET_CREATE, TICKET_EDIT_CC, TICKET_EDIT_COMMENT, TICKET_EDIT_DESCRIPTION, TICKET_MODIFY, TICKET_VIEW, TIMELINE_VIEW, TRAC_ADMIN, WIKI_ADMIN, - WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_VIEW + WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_RENAME, WIKI_VIEW ===== test_permission_remove_multiple_actions_ok ===== @@ -249,7 +249,7 @@ Available actions: SEARCH_VIEW, TICKET_ADMIN, TICKET_APPEND, TICKET_CHGPROP, TICKET_CREATE, TICKET_EDIT_CC, TICKET_EDIT_COMMENT, TICKET_EDIT_DESCRIPTION, TICKET_MODIFY, TICKET_VIEW, TIMELINE_VIEW, TRAC_ADMIN, WIKI_ADMIN, - WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_VIEW + WIKI_CREATE, WIKI_DELETE, WIKI_MODIFY, WIKI_RENAME, WIKI_VIEW ===== test_component_list_ok ===== diff --git a/trac/htdocs/css/wiki.css b/trac/htdocs/css/wiki.css index 091f2f6..f109783 100644 --- a/trac/htdocs/css/wiki.css +++ b/trac/htdocs/css/wiki.css @@ -42,7 +42,7 @@ #changeinfo br { clear: left } #changeinfo .options { padding: 0 0 1em 1em } #changeinfo .options, #changeinfo .buttons { clear: left } -#delete, #save { margin-left: 6em } +#delete, #rename, #save { margin-left: 6em } #preview { background: #f4f4f4 url(../draft.png); margin: 1em 0 2em; diff --git a/trac/wiki/templates/wiki_rename.html b/trac/wiki/templates/wiki_rename.html new file mode 100644 index 0000000..5c5d6dc --- /dev/null +++ b/trac/wiki/templates/wiki_rename.html @@ -0,0 +1,48 @@ + + + + + $title + + + +
+

${_('Rename')} $page.name

+
+

+ + Renaming the page will rename all existing versions + of the page in place.
+ The history of the renamed page will be exactly the same as the one + of the original page. +
+

+ + +

+
+
+ ${_('Rename')} ${_('Options')} + + +
+ If you choose to leave a redirection, this will + re-create the $page.name page with a link pointing to the new + page. +
+

+
+ + +
+
+
+ + diff --git a/trac/wiki/templates/wiki_view.html b/trac/wiki/templates/wiki_view.html index 0715fbe..17880bd 100644 --- a/trac/wiki/templates/wiki_view.html +++ b/trac/wiki/templates/wiki_view.html @@ -71,7 +71,8 @@ + admin_perm = 'WIKI_ADMIN' in perm(page.resource); + rename_perm = 'WIKI_RENAME' in perm(page.resource)">
@@ -101,6 +102,14 @@ ${attach_file_form(attachments)} + +
+
+ + +
+
+
diff --git a/trac/wiki/web_ui.py b/trac/wiki/web_ui.py index d8a69fe..677ddec 100644 --- a/trac/wiki/web_ui.py +++ b/trac/wiki/web_ui.py @@ -94,7 +94,7 @@ class WikiModule(Component): # IPermissionRequestor methods def get_permission_actions(self): - actions = ['WIKI_CREATE', 'WIKI_DELETE', 'WIKI_MODIFY', 'WIKI_VIEW'] + actions = ['WIKI_CREATE', 'WIKI_DELETE', 'WIKI_MODIFY', 'WIKI_RENAME', 'WIKI_VIEW'] return actions + [('WIKI_ADMIN', actions)] # IRequestHandler methods @@ -146,12 +146,16 @@ class WikiModule(Component): return self._render_editor(req, page, action, has_collision) elif action == 'delete': self._do_delete(req, versioned_page) + elif action == 'rename': + return self._do_rename(req, page) elif action == 'diff': get_diff_options(req) req.redirect(req.href.wiki(versioned_page.name, action='diff', old_version=old_version)) elif action == 'delete': - return self._render_confirm(req, versioned_page) + return self._render_confirm_delete(req, versioned_page) + elif action == 'rename': + return self._render_confirm_rename(req, page) elif action == 'edit': return self._render_editor(req, versioned_page) elif action == 'diff': @@ -270,6 +274,50 @@ class WikiModule(Component): version=version, name=page.name)) req.redirect(req.href.wiki(page.name)) + def _do_rename(self, req, page): + if page.readonly: + req.perm(page.resource).require('WIKI_ADMIN') + else: + req.perm(page.resource).require('WIKI_RENAME') + + if 'cancel' in req.args: + req.redirect(get_resource_url(self.env, page.resource, req.href)) + + new_name = req.args.get('new_name', '').rstrip('/') + old_name = page.name + old_version = page.version + leave_redirection = req.args.get('leave_redirection') + + # verify input parameters + warn = None + if not new_name: + warn = _("New name is mandatory for a rename.") + elif new_name == old_name: + warn = _("New name must be different from old name.") + if warn: + add_warning(req, warn) + return self._render_rename_form(req, page) + + + @with_transaction(self.env) + def do_rename(db): + page.rename(new_name, db) + if leave_redirection: + redirection_page = WikiPage(self.env, old_name) + redirection_page.text = _("See [wiki:%(page)s].", + page=new_name) + author = get_reporter_id(req) + comment = _("[wiki:'%(new_name)s@%(old_version)d' " + "%(old_name)s] was renamed to %(new_name)s", + old_name=old_name, old_version=old_version, + new_name=new_name) + redirection_page.save(author, comment, req.remote_addr, + None, db) + + req.redirect(req.href.wiki(leave_redirection and old_name or new_name)) + + + def _do_save(self, req, page): if page.readonly: req.perm(page.resource).require('WIKI_ADMIN') @@ -294,7 +342,7 @@ class WikiModule(Component): add_warning(req, _("Page not modified, showing latest version.")) return self._render_view(req, page) - def _render_confirm(self, req, page): + def _render_confirm_delete(self, req, page): if page.readonly: req.perm(page.resource).require('WIKI_ADMIN') else: @@ -319,6 +367,17 @@ class WikiModule(Component): self._wiki_ctxtnav(req, page) return 'wiki_delete.html', data, None + def _render_confirm_rename(self, req, page): + if page.readonly: + req.perm(page.resource).require('WIKI_ADMIN') + else: + req.perm(page.resource).require('WIKI_RENAME') + + data = self._page_data(req, page, 'rename') + self._wiki_ctxtnav(req, page) + return 'wiki_rename.html', data, None + + def _render_diff(self, req, page): if not page.exists: raise TracError(_('Version %(num)s of page "%(name)s" does not '