fix empty revisions display when restoring a page

test plan:
 * rename a wiki page several times
 * navigate to the revision history for the page
 * restore to a version with a different page name
 - the page should refresh, showing the newly restored name

fixes CNVS-13845

Change-Id: I56df4de17f25393e3d2ce585c777ef3d5a483e51
Reviewed-on: https://gerrit.instructure.com/37470
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
This commit is contained in:
Mark Severson 2014-07-09 14:35:06 -06:00
parent 94c9c14994
commit 6e3dfb3851
3 changed files with 9 additions and 2 deletions

View File

@ -14,6 +14,7 @@ require [
revisionsView = new WikiPageRevisionsView
collection: revisions
pages_path: ENV.WIKI_PAGES_PATH
revisionsView.on 'selectionChanged', (newSelection) ->
contentView.setModel(newSelection.model)
if !newSelection.model.get('title') || newSelection.model.get('title') == ''

View File

@ -36,5 +36,8 @@ define [
restore: (ev) ->
ev?.preventDefault()
@model.restore().done =>
window.location.reload()
@model.restore().done (attrs) =>
if @pages_path
window.location.href = "#{@pages_path}/#{attrs.url}/revisions"
else
window.location.reload()

View File

@ -23,6 +23,8 @@ define [
'aside': '$aside'
'.revisions-list': '$revisionsList'
@optionProperty 'pages_path'
initialize: (options) ->
super
@selectedRevision = null
@ -65,6 +67,7 @@ define [
@setSelectedModelAndView(model, view)
selectModel() unless @selectedModel
view.pages_path = @pages_path
view.$el.on 'click', selectModel
setSelectedModelAndView: (model, view) ->