Resolve conflict #20

Closed
wants to merge 10 commits into
from

Conversation

Projects
None yet
2 participants

mbryk commented Mar 26, 2012

changes defaultcontroller.php and view.php
sets up a conflict view. this will show how the 2 different revisions are different, and inform the user.

+<?php echo CHtml::link(Yii::t('wiki','OLD: '),array('view', 'uid'=>$page->page_uid, 'rev'=>$rev->id)) .$rev->content.'<br />' ?>
+<div class="wiki-diff">
+<?php echo CHtml::link(Yii::t('wiki','Current Revision: '),array('view', 'uid'=>$page->page_uid)).$diff1.'<br />' ?>
+<?php echo 'Your Revision'.$diff2 ?>
@mbryk

mbryk Apr 1, 2012

how do i create a new revision here, as if validating the previous edit? i sent the added text to the conflict controller, but not the actual submitted edit form, from which we create the revision in actionEdit.

@samdark samdark closed this Apr 4, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment