Merge branch 'tamron' of git.xfoto.com.cn:Kodo/kodo into tamron
huangqimin001
2 changed files with 35 additions and 1 deletions
+ 34
- 0
api/admin_views.py
@@ -962,6 +962,40 @@ def member_activity_register_list(request, administrator): |
||
| 962 | 962 |
|
| 963 | 963 |
|
| 964 | 964 |
@check_admin |
| 965 |
+@logit |
|
| 966 |
+def member_activity_contribute_list(request, administrator): |
|
| 967 |
+ brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
| 968 |
+ activity_id = request.POST.get('activity_id', '')
|
|
| 969 |
+ content_type = get_query_value(request, 'content_type', val_cast_type='int') |
|
| 970 |
+ audit_status = request.POST.get('audit_status', '')
|
|
| 971 |
+ is_selected = request.POST.get('is_selected', '')
|
|
| 972 |
+ query = request.POST.get('query', '')
|
|
| 973 |
+ page = request.POST.get('page', 1)
|
|
| 974 |
+ num = request.POST.get('num', 20)
|
|
| 975 |
+ |
|
| 976 |
+ contributions = MemberActivityContributionInfo.objects.filter(activity_id=activity_id, status=True) |
|
| 977 |
+ if 'content_type' in request.POST: |
|
| 978 |
+ contributions = contributions.filter(content_type=content_type) |
|
| 979 |
+ if audit_status != '': |
|
| 980 |
+ contributions = contributions.filter(audit_status=audit_status) |
|
| 981 |
+ if is_selected != '': |
|
| 982 |
+ contributions = contributions.filter(is_selected=is_selected) |
|
| 983 |
+ if query: |
|
| 984 |
+ contributions = contributions.filter(Q(title__icontains=query) | Q(user_name__icontains=query)) |
|
| 985 |
+ |
|
| 986 |
+ contributions = contributions.order_by('-pk')
|
|
| 987 |
+ count = contributions.count() |
|
| 988 |
+ contributions, left = pagination(contributions, page, num) |
|
| 989 |
+ contributions = [contribution.data for contribution in contributions] |
|
| 990 |
+ |
|
| 991 |
+ return response(data={
|
|
| 992 |
+ 'contributions': contributions, |
|
| 993 |
+ 'left': left, |
|
| 994 |
+ 'count': count |
|
| 995 |
+ }) |
|
| 996 |
+ |
|
| 997 |
+ |
|
| 998 |
+@check_admin |
|
| 965 | 999 |
@transaction.atomic |
| 966 | 1000 |
def member_activity_contribute_audit(request, administrator): |
| 967 | 1001 |
contribution_id = request.POST.get('contribution_id', '')
|
+ 1
- 1
api/urls.py
@@ -171,7 +171,7 @@ urlpatterns += [ |
||
| 171 | 171 |
url(r'^admin/member/activity/share/list$', admin_views.member_activity_share_list, name='member_activity_share_list'), |
| 172 | 172 |
url(r'^admin/member/activity/register/list$', admin_views.member_activity_register_list, name='member_activity_register_list'), |
| 173 | 173 |
|
| 174 |
- url(r'^admin/member/activity/contribute/list$', member_views.activity_contribute_list, name='admin_member_activity_contribute_list'), |
|
| 174 |
+ url(r'^admin/member/activity/contribute/list$', admin_views.member_activity_contribute_list, name='admin_member_activity_contribute_list'), |
|
| 175 | 175 |
url(r'^admin/member/activity/contribute/audit$', admin_views.member_activity_contribute_audit, name='admin_member_activity_contribute_audit'), |
| 176 | 176 |
url(r'^admin/member/activity/contribute/selected$', admin_views.member_activity_contribute_selected, name='admin_member_activity_contribute_selected'), |
| 177 | 177 |
|