diff options
Diffstat (limited to 'gstudio/views')
-rw-r--r-- | gstudio/views/history.py | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/gstudio/views/history.py b/gstudio/views/history.py index 1c05b848..d4adac9e 100644 --- a/gstudio/views/history.py +++ b/gstudio/views/history.py @@ -12,20 +12,21 @@ from gstudio.views.decorators import protect_nodetype from gstudio.views.decorators import update_queryset import ast -def history(request,ssid): +def history(request,ssid,cnt): # iden=request.GET["id"] nt1=Version.objects.get(id=ssid) nt=nt1.object.ref ver_dict=nt.version_info(ssid) - variables = RequestContext(request,{'ver_dict':ver_dict ,'nt':nt,'ssid':ssid }) + variables = RequestContext(request,{'ver_dict':ver_dict ,'nt':nt,'ssid':ssid,'cnt':cnt }) template="gstudio/display.html" return render_to_response(template,variables) -def showHistory(request): - vid1=request.GET["group1"] +def showHistory(request,ssid): + # vid1=request.GET["group1"] + vid1=ssid vid2=request.GET["group2"] nt=Version.objects.get(id=vid1) - nt1=nt.object + nt1=nt.object.ref pp=pprint.PrettyPrinter(indent=4) ver_new1=Version.objects.get(id=vid1) ver_old1=Version.objects.get(id=vid2) @@ -45,44 +46,46 @@ def showHistory(request): ver_old_nbh=ver_old_dict['nbhood'] ver_old_dict1=ast.literal_eval(ver_old_nbh) - ver_new_nbh=ver_new_nbh.replace(",","\n") - ver_old_nbh=ver_old_nbh.replace(",","\n") + # ver_new_nbh=ver_new_nbh.replace(",","\n") + # ver_old_nbh=ver_old_nbh.replace(",","\n") d=[] d1=[] field=['Name','Plural Name','Alternate Name','Authors','Content'] - for each in ver_new_dict: + for each in ver_new_dict1: ver_new="" ver_old="" if each =='altnames': - ver_new+=field[2] + ":" + ver_new_dict['altnames'] - ver_old+=field[2] + ":" + ver_old_dict['altnames'] + ver_new+=ver_new_dict['altnames'] + ver_old+=ver_old_dict['altnames'] diffs = dmp.diff_main(ver_new, ver_old) d.append(dmp.diff_prettyHtml(diffs)) - diffs = dmp.diff_main(ver_old, ver_new) - d1.append(dmp.diff_prettyHtml(diffs)) + # diffs = dmp.diff_main(ver_old, ver_new) + # d1.append(dmp.diff_prettyHtml(diffs)) if each =='title': - ver_new+=field[0] + ":" + ver_new_dict['title'] - ver_old+=field[0] + ":" + ver_old_dict['title'] + ver_new+=ver_new_dict['title'] + ver_old+=ver_old_dict['title'] diffs = dmp.diff_main(ver_new, ver_old) d.append(dmp.diff_prettyHtml(diffs)) - diffs = dmp.diff_main(ver_old, ver_new) - d1.append(dmp.diff_prettyHtml(diffs)) + # diffs = dmp.diff_main(ver_old, ver_new) + # d1.append(dmp.diff_prettyHtml(diffs)) if each =='plural': - ver_new+=field[1] + ":" + ver_new_dict['plural'] - ver_old+=field[1] + ":" + ver_old_dict['plural'] + ver_new+=ver_new_dict['plural'] + ver_old+=ver_old_dict['plural'] diffs = dmp.diff_main(ver_new, ver_old) d.append(dmp.diff_prettyHtml(diffs)) - diffs = dmp.diff_main(ver_old, ver_new) - d1.append(dmp.diff_prettyHtml(diffs)) - if each =='content': - ver_new+=field[4] + ":" + ver_new_dict['content'] - ver_old+=field[4] + ":" + ver_old_dict['content'] - diffs = dmp.diff_main(ver_new, ver_old) - d.append(dmp.diff_prettyHtml(diffs)) - diffs = dmp.diff_main(ver_old, ver_new) - d1.append(dmp.diff_prettyHtml(diffs)) + # diffs = dmp.diff_main(ver_old, ver_new) + # d1.append(dmp.diff_prettyHtml(diffs)) + # if each =='content': + ver_new="" + ver_old="" + ver_new+=ver_new_dict['content'] + ver_old+=ver_old_dict['content'] + diffs = dmp.diff_main(ver_new, ver_old) + d.append(dmp.diff_prettyHtml(diffs)) + # diffs = dmp.diff_main(ver_old, ver_new) + # d1.append(dmp.diff_prettyHtml(diffs)) # for each in ver_new_dict1: # ver_new="" @@ -96,7 +99,7 @@ def showHistory(request): ver_new=nt1.version_info(request.GET["group1"]) ver_old=nt1.version_info(request.GET["group2"]) - variables=RequestContext(request,{'nt':nt1,'ver_old':ver_old_dict,'ver_new':ver_new_dict,'diffs':d ,'vid1':vid1,'vid2':vid2,'diffs1':d1}) + variables=RequestContext(request,{'nt':nt1,'ver_old':ver_old_dict,'ver_new':ver_new_dict,'diffs':d ,'vid1':vid1,'vid2':vid2 }) template="gstudio/version_diff.html" return render_to_response(template,variables) |