--- a/web/hdabo/views.py Sat Jun 11 03:30:18 2011 +0200
+++ b/web/hdabo/views.py Tue Jun 14 01:51:26 2011 +0200
@@ -1,7 +1,10 @@
+from django.conf import settings
from django.contrib.auth.decorators import login_required #@UnusedImport
from django.shortcuts import render_to_response
from django.template import RequestContext
+from hdabo.wp_utils import query_wikipedia_title
from models import Organisation, Datasheet, TaggedSheet, Tag
+from wikitools import wiki
#@login_required
@@ -75,7 +78,7 @@
context_instance=RequestContext(request))
#@login_required
-def TagUpDown(request):
+def tag_up_down(request):
ds_id = request.POST["datasheet_id"]
#tag_id = request.POST["tag_id"]
# tag_pos indicates the position (from 0) of the tag in the list. NB : it is different from the TagSheet.order in the database.
@@ -102,11 +105,11 @@
ts.save()
other_ts.save()
- return GetTagTable(request=request, ds_id=ds_id, valid=0)
+ return get_tag_table(request=request, ds_id=ds_id, valid=0)
#@login_required
-def GetTagTable(request=None, ds_id=None, valid=None):
+def get_tag_table(request=None, ds_id=None, valid=None):
ordered_tags = TaggedSheet.objects.filter(datasheet=Datasheet.objects.filter(id=ds_id)[0]).order_by('order')
@@ -116,7 +119,7 @@
#@login_required
-def RemoveTagFromList(request=None):
+def remove_tag_from_list(request=None):
ds_id = request.POST["datasheet_id"]
tag_id = request.POST["tag_id"]
@@ -126,11 +129,11 @@
ts = ds_tags.filter(tag=Tag.objects.filter(id=tag_id))[0]
ts.delete()
- return GetTagTable(request=request, ds_id=ds_id, valid=0)
+ return get_tag_table(request=request, ds_id=ds_id, valid=0)
#@login_required
-def ValidateWPLink(request=None):
+def validate_wp_link(request=None):
ds_id = request.POST["datasheet_id"]
tag_id = request.POST["tag_id"]
@@ -143,7 +146,31 @@
tag.wikipedia_activated = wp_activ
tag.save()
- return GetTagTable(request=request, ds_id=ds_id, valid=0)
+ return get_tag_table(request=request, ds_id=ds_id, valid=0)
-
-
+#@login_required
+def modify_tag(request):
+
+ tag_id = request.POST["id"]
+ tag_label = request.POST["value"]
+ ds_id = request.POST["datasheet_id"]
+
+ site = wiki.Wiki(settings.WIKIPEDIA_API_URL) #@UndefinedVariable
+
+ new_label, status, url, pageid, response = query_wikipedia_title(site, tag_label) #@UnusedVariable
+
+ tag = Tag.objects.get(id=tag_id)
+
+ if new_label is not None:
+ tag.label = new_label
+ if status is not None:
+ tag.url_status = status
+ if url is not None:
+ tag.wikipedia_url = url
+ tag.wikipedia_activated = True
+ if pageid is not None:
+ tag.wikipedia_pageid = pageid
+
+ tag.save()
+
+ return get_tag_table(request=request, ds_id=ds_id, valid=0)