openvibers/openvibe.wiki Commits

Guide the Wiki revision save control (#289)

OP OpenVibers committed 2 days ago · 6b7084798c · 2 files, +2 −1

Changes

ddiff --git a/server/render/views.js b/server/render/views.js
iindex e92631b..5faedeb 100644
---- a/server/render/views.js
++++ b/server/render/views.js
@@@ -520,7 +520,7 @@ ${isNew ? html`<label>Parent page <select name="parent_id"><option value="">(top
${citations.length ? html`<fieldset><legend>Sources of revision ${String(baseRevision)} (untick to drop from the new revision; they stay on the old one)</legend>${citations.map((c) => html`<label class="wk-check"><input type="checkbox" name="keep_citation" value="${String(c.id)}"${values.keep && !values.keep.includes(String(c.id)) ? '' : raw(' checked')}> ${c.title || c.url || c.sourceItemId}${c.retrievedAt ? html`, retrieved ${t(c.retrievedAt)}` : ''}</label>`)}</fieldset>` : ''}
${citationRows(2)}
<label>Edit note <input type="text" name="message" maxlength="300" value="${values.message || ''}"></label>
--<p class="wk-buttons"><button type="submit" name="op" value="preview">Preview</button> <button type="submit" name="op" value="save">Save revision</button> <button type="submit" name="op" value="publish">Save and publish</button></p>
++<p class="wk-buttons"><button type="submit" name="op" value="preview">Preview</button> <button type="submit" name="op" value="save" data-ov-guide="wiki.revision">Save revision</button> <button type="submit" name="op" value="publish">Save and publish</button></p>
</form></section>`;
}
ddiff --git a/test/nojs.test.js b/test/nojs.test.js
iindex 29404ab..0d698d0 100644
---- a/test/nojs.test.js
++++ b/test/nojs.test.js
@@@ -90,6 +90,7 @@ const stripScripts = (html) => html.replace(/<script[\s\S]*?<\/script>/g, '');
// Edit form: prefilled, keeps sources by default, publishes a new revision.
r = await H.req(h, 'GET', '/w/board-games/chess/edit', { cookie });
++ assert.ok(r.text.includes('data-ov-guide="wiki.revision"'), 'the revision Save control is addressable');
assert.strictEqual(r.status, 200);
assert.ok(r.text.includes('name="expected_revision" value="1"'));
assert.ok(r.text.includes('name="keep_citation"'));