def revert_doc(request,group_id,node_id,version_1): node=collection.Node.one({'_id':ObjectId(node_id)}) group=collection.Node.one({'_id':ObjectId(group_id)}) doc=history_manager.get_version_document(node,version_1) print node for attr in node: if attr != '_type': try: node[attr] = doc[attr]; except: node[attr] =node[attr] node.modified_by=request.user.id node.save() update_mobwrite = update_mobwrite_content_org(node) view ='revert' ver=history_manager.get_current_version(node) selected_versions=selected_versions = {"1": version_1, "2": ""} return render_to_response("ndf/version_page.html", {'view': view, 'selected_versions': selected_versions, 'node':node, 'groupid':group_id, 'group_id':group_id, 'content':node, 'ver':ver }, context_instance = RequestContext(request) )
def merge_doc(request,group_id,node_id,version_1,version_2): node=collection.Node.one({'_id':ObjectId(node_id)}) doc=history_manager.get_version_document(node,version_1) doc2=history_manager.get_version_document(node,version_2) a=doc.content_org b=doc2.content_org c=doc.content d=doc2.content con2=diff_string(a,b) con3=diff_string(c,d) doc2.update(doc) for attr in node: if attr != '_type': try: node[attr] = doc2[attr]; except: node[attr]=node[attr] doc2.content_org=con2 doc2.content=con3 node.content_org=doc2.content_org node.content=doc2.content node.modified_by=request.user.id node.save() update_mobwrite = update_mobwrite_content_org(node) ver=history_manager.get_current_version(node) view='merge' return render_to_response("ndf/version_page.html", {'view': view, 'version_no':version_1, 'node':node, 'groupid':group_id, 'group_id':group_id, 'content':node, 'ver':ver }, context_instance = RequestContext(request) )