Skip to content

Commit

Permalink
wrote api getActionType
Browse files Browse the repository at this point in the history
  • Loading branch information
ruixia committed Jan 8, 2012
1 parent fd9470f commit 8e97b54
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 15 deletions.
2 changes: 0 additions & 2 deletions api-notes
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,3 @@ api result return
response:{
}



17 changes: 7 additions & 10 deletions templates/backbone/api_overview_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,25 @@
<div class="span3">
<ul class="unstyled">
<li>
<a href="/api/overview/">Overview</a>
<a href="/apidoc/overview/">Overview</a>
</li>
<li>
<a href="/api/overview/recordaction/">Record Action</a>
<a href="/apidoc/doAction/">doAction</a>
</li>
<li>
<a href="/api/overview/clickstats/">Click Stats</a>
<a href="/apidoc/getAllSharers/">getAllSharers</a>
</li>
<li>
<a href="/api/overview/actionstats/">Action Stats</a>
<a href="/apidoc/getSharerInfo/">getSharerInfo</a>
</li>
<li>
<a href="/api/overview/sharerstats/">Sharer Stats</a>
<a href="/apidoc/addSharer/">addSharer</a>
</li>
<li>
<a href="/api/overview/plugininfo/">Plugin Page Info</a>
<a href="/apidoc/toggleSharer/">toggleSharer</a>
</li>
<li>
<a href="/api/overview/actiontypelist/">Action Type List</a>
</li>
<li>
<a href="/api/overview/referrerbreakdown/">Referrer Breakdown</a>
<a href="/apidoc/getActionType/">getActionType</a>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/backbone/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<li><a href="/">Sharer</a></li>
<li><a href="/pluginpage/">Sharer Page</a></li>
<li><a href="/actiontype/">Action</a></li>
<li><a href="/api/overview/">API</a></li>
<li><a href="/apidoc/overview/">API doc</a></li>
</ul>
<p class="pull-right" id="header-pull-right">
<ul class="nav secondary-nav">
Expand Down
7 changes: 6 additions & 1 deletion urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@


#api doc page
#(r'^apidoc/overview/$', apidoc_overview_page),
(r'^apidoc/overview/$', apidoc_overview_page),
#(r'^apidoc/doAction/$', apidoc_do_action_page),
#(r'^apidoc/getAllSharers/$', apidoc_get_all_sharers_page),
#(r'^apidoc/getSharerInfo/$', apidoc_get_sharer_info_page),
Expand All @@ -53,6 +53,11 @@
(r'^api/doAction/(?P<api_key>\w{30})/$', api_do_action_page),
(r'^api/addSharer/(?P<api_key>\w{30})/$', api_add_sharer_page),
(r'^api/toggleSharer/(?P<api_key>\w{30})/$', api_toggle_sharer_page),




(r'^api/getActionTypes/(?P<api_key>\w{30})/$', api_get_action_type_page),

(r'^referrer/$', referrer_page),
(r'^referrer/([0-9]+)/$', path_page),
Expand Down
Binary file modified urls.pyc
Binary file not shown.
18 changes: 17 additions & 1 deletion wordout/api_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,20 @@ def api_toggle_sharer_page(request, api_key):
result = get_api_metaset('failed', 'invalid data sent.')
return HttpResponse(simplejson.dumps(result), 'application/javascript')


def api_get_action_type_page(request, api_key):
customer, result = get_customer_by_api_key(api_key)
if result:
return HttpResponse(simplejson.dumps(result), 'application/javascript')
action_type_ls = Action_Type.objects.filter(customer = customer)
status = 'OK'
message = 'your action type is listed.'
result = get_api_metaset(status, message)
result['response'] = []
holder = {}
for i in action_type_ls:
holder['action_type_identifier'] = i.customer_action_type_identifier
holder['action_name'] = i.action_name
holder['description'] = i.description
holder['enabled'] = i.enabled
result['response'].append(holder)
return HttpResponse(simplejson.dumps(result), 'application/javascript')
Binary file modified wordoutdb
Binary file not shown.

0 comments on commit 8e97b54

Please sign in to comment.