From 10bd2dd3fcf8d350e3efc84a77fb68b32d4b14fb Mon Sep 17 00:00:00 2001 From: makfire Date: Wed, 8 Jul 2015 15:37:25 +0530 Subject: trash view stablished --- .../ndf/templates/ndf/node_ajax_view.html | 2 +- gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 1 + gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py | 7 +++++++ gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py create mode 100644 gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py (limited to 'gnowsys-ndf') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html index 59e9cf3..58b6e0b 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html @@ -1336,7 +1336,7 @@ ul#navigation li a.last { {% if node.created_by == request.user.id %} {% if node.member_of_names_list.0 == "Page" %} - {% trans "Delete" %} + {% trans "Delete" %} {% elif node.member_of_names_list.0 == "Term" %} {% trans "Delete" %} {% endif %} diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index ffb3db7..8c02671 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -67,6 +67,7 @@ urlpatterns = patterns('', (r'^(?P[^/]+)/observation', include('gnowsys_ndf.ndf.urls.observation')), (r'^(?P[^/]+)/compare', include('gnowsys_ndf.ndf.urls.version')), (r'^(?P[^/]+)/moderation', include('gnowsys_ndf.ndf.urls.moderation')), + (r'^(?P[^/]+)/trash',include('gnowsys_ndf.ndf.urls.trash')), url(r'^(?P[^/]+)/topic_details/(?P[\w-]+)', 'gnowsys_ndf.ndf.views.topics.topic_detail_view', name='topic_details'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py new file mode 100644 index 0000000..9073651 --- /dev/null +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py @@ -0,0 +1,7 @@ +from django.conf.urls import patterns, url + +urlpatterns = patterns('gnowsys_ndf.ndf.views.trash', + url(r'^/delete/(?P[\w-]+)$', 'trash_resource',name='trash_resource'), + ) + + diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py new file mode 100644 index 0000000..043b188 --- /dev/null +++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py @@ -0,0 +1,22 @@ + +from django.http import HttpResponse +from django.shortcuts import render_to_response # , render +from django.template import RequestContext +from gnowsys_ndf.ndf.models import * +from gnowsys_ndf.ndf.views.page import * + + + + + +def trash_resource(request,group_id,node_id): + node = node_collection.find_one({"_id":ObjectId(node_id)}) + trash_node = node_collection.find_one({"name":"Trash"}); + if ObjectId(group_id) in node.group_set: + node.group_set.remove(ObjectId(group_id)) + #fetch the tarsh group id + if trash_node._id not in node.group_set: + node.group_set.append(trash_node._id) + print "node",node.group_set + node.save() + return (eval('page')(request, group_id)) -- cgit v1.1 From 62b7b318060b0bc32aaab0221f55df9d93a94906 Mon Sep 17 00:00:00 2001 From: makfire Date: Wed, 8 Jul 2015 17:33:53 +0530 Subject: deletion flow setupped --- .../gnowsys_ndf/ndf/templates/ndf/data_review.html | 20 ++++++++++++++++++++ .../ndf/templates/ndf/data_review_table.html | 6 +++++- .../ndf/templates/ndf/data_review_tbody.html | 6 ++++++ gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py | 6 ++++-- gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py | 8 +++++++- 5 files changed, 42 insertions(+), 4 deletions(-) (limited to 'gnowsys-ndf') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html index 9fd5dee..26e1d23 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html @@ -824,6 +824,26 @@ $drContainer.css("opacity", "1"); }) // ---END of search in the data-review + function deleteNode(node_id) + { + a = node_id + alert(a) + $.ajax({ + + url:"{% url 'delete_resource' groupid %}", + type:'Get', + data:{ + 'node_id':node_id + }, + + success:function(data){ + alert(data) + } + + + }); + + } // {% endblock %} diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html index 7313197..8b6c9e5 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html @@ -14,6 +14,7 @@ Alignment & Level Curate Advance + Admin {% if title == "moderation" %} Moderation {% endif %} @@ -65,7 +66,10 @@ Reading Level Time Required Text Complexity - + + + Purge + Restore {% if title == "moderation" %} Discuss diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html index 3c8d8a6..8057b22 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html @@ -291,6 +291,12 @@ --> + + +
Delete
+
restore
+ + {% if title == "moderation" %} diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py index 9073651..e4007cb 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/trash.py @@ -1,7 +1,9 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.trash', - url(r'^/delete/(?P[\w-]+)$', 'trash_resource',name='trash_resource'), - ) + url(r'^/delete/(?P[\w-]+)$', 'trash_resource',name='trash_resource'), + url(r'^/delete$', 'delete_resource',name='delete_resource'), + + ) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py index 043b188..718dd90 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py @@ -4,7 +4,7 @@ from django.shortcuts import render_to_response # , render from django.template import RequestContext from gnowsys_ndf.ndf.models import * from gnowsys_ndf.ndf.views.page import * - +from gnowsys_ndf.ndf.views.methods import * @@ -20,3 +20,9 @@ def trash_resource(request,group_id,node_id): print "node",node.group_set node.save() return (eval('page')(request, group_id)) + + +def delete_resource(request,group_id): + node_id = request.GET.getlist('node_id','')[0] + delete_node(ObjectId(node_id),deletion_type=1) + return HttpResponse("Deleted Successfully") -- cgit v1.1 From 620bec6e6fafbaa6aa40bcb07898189e94263b94 Mon Sep 17 00:00:00 2001 From: makfire Date: Thu, 9 Jul 2015 16:43:42 +0530 Subject: trash functionality done --- .../gnowsys_ndf/ndf/management/commands/filldb.py | 16 ++++++++ .../gnowsys_ndf/ndf/templates/ndf/data_review.html | 19 +++++++--- .../ndf/templates/ndf/data_review_table.html | 12 +++--- .../ndf/templates/ndf/data_review_tbody.html | 14 ++++--- .../gnowsys_ndf/ndf/templates/ndf/uDashboard.html | 11 ++++++ .../gnowsys_ndf/ndf/templatetags/ndf_tags.py | 4 +- gnowsys-ndf/gnowsys_ndf/ndf/views/page.py | 44 ++++++++++------------ gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py | 23 +++++++---- 8 files changed, 94 insertions(+), 49 deletions(-) (limited to 'gnowsys-ndf') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py b/gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py index 659ae49..0f80d1a 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py @@ -286,6 +286,22 @@ class Command(BaseCommand): print " GList ("+glc_node_name+") container already created !" info_message += "\n GList ("+glc_node_name+") container already created !" + Group_node = node_collection.collection.Group(); + node_doc =node_collection.one({'$and':[{'_type': u'Group'},{'name': u'Trash'}]}) + if node_doc is None: + Group_node.name = unicode('Trash') + Group_node.status = unicode('PUBLISHED') + Group_node.created_by = 1 + Group_node.modified_by = 1 + Group_node.access_policy = unicode("PRIVATE") + Group_node.member_of.append(node_collection.one({"_type": "GSystemType", 'name': "Group"})._id) + Group_node.disclosure_policy=unicode('DISCLOSED_TO_MEM') + Group_node.visibility_policy=unicode('NOT_ANNOUNCED') + Group_node.encryption_policy=unicode('NOT_ENCRYPTED') + Group_node.edit_policy =unicode('NON_EDITABLE') + Group_node.save() + else: + print "Trash Group already created." print "\n" info_message += "\n\n" log_list.append(info_message) diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html index 26e1d23..17fb4b5 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html @@ -824,20 +824,29 @@ $drContainer.css("opacity", "1"); }) // ---END of search in the data-review - function deleteNode(node_id) + function deleteNode(oid) { - a = node_id - alert(a) $.ajax({ url:"{% url 'delete_resource' groupid %}", type:'Get', data:{ - 'node_id':node_id + 'node_id':oid }, success:function(data){ - alert(data) + //updateContent(); + var $resBlankRow = $("tr#blank-row-" + oid); + // fetching resource object VIEW row + var $resViewRow = $("tr#view-row-" + oid); + // fetching resource object EDIT row + var $resEditRow = $("tr#edit-row-" + oid); + + $($resEditRow).add($resViewRow).add($resBlankRow).animate({ + opacity: 0.1 + }, 1000).fadeOut(1000); + + setCurrNoneToEditRow(oid) } diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html index 8b6c9e5..bf1807d 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html @@ -1,6 +1,5 @@ {% load cache %} - @@ -14,7 +13,9 @@ - + {% if user.is_superuser %} + + {% endif %} {% if title == "moderation" %} {% endif %} @@ -67,9 +68,10 @@ - - - + {% if user.is_superuser %} + + + {% endif %} {% if title == "moderation" %} diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html index 8057b22..d1d5314 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html @@ -291,11 +291,15 @@ --> - + {% if user.is_superuser %} + + + {% endif %} {% if title == "moderation" %} diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html index 0dc035b..9923444 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html @@ -44,6 +44,10 @@ .img-height { height: 100%; } + .fi-trash{ + color:orange; + + } .div-height { margin-bottom: 0.5em; @@ -127,12 +131,19 @@ {% trans "Files uploaded" %}:  {{file_count}}
{% trans "Quiz" %}: {{quiz_count}}
{% trans "Forum" %}: {{forum_count}}
+ + + {% if user.is_superuser %} + + {% endif %}
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py b/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py index 29f1c99..fec38e5 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py @@ -656,7 +656,9 @@ def get_gapps_iconbar(request, group_id): if k1 == "name": if v1.lower() not in user_gapps: del gapps[k] - + + if group_obj.name == 'Trash': + gapps={} return { "template": "ndf/gapps_iconbar.html", "request": request, diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/page.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/page.py index f88df0d..31c2d6f 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/views/page.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/page.py @@ -61,7 +61,6 @@ def page(request, group_id, app_id=None): if group_ins: group_id = str(group_ins._id) - print group_id else : auth = node_collection.one({'_type': 'Author', 'name': unicode(request.user.username) }) @@ -105,7 +104,6 @@ def page(request, group_id, app_id=None): # End of user shelf if request.method == "POST": - title = gst_page.name search_field = request.POST['search_field'] page_nodes = node_collection.find({ @@ -144,15 +142,14 @@ def page(request, group_id, app_id=None): ) elif gst_page._id == ObjectId(app_id): - # Page list view + # Page list view # code for moderated Groups group_type = node_collection.one({'_id': ObjectId(group_id)}) group_info=group_type_info(group_id) title = gst_page.name - + ''' if group_info == "Moderated": - title = gst_page.name node=group_type.prior_node[0] page_nodes = node_collection.find({'member_of': {'$all': [ObjectId(app_id)]}, @@ -167,12 +164,12 @@ def page(request, group_id, app_id=None): context_instance=RequestContext(request)) elif group_info == "BaseModerated": - #code for parent Groups + #code for parent Groups node = node_collection.find({'member_of': {'$all': [ObjectId(app_id)]}, 'group_set': {'$all': [ObjectId(group_id)]}, 'status': {'$nin': ['HIDDEN']} }).sort('last_update', -1) - + if node is None: node = node_collection.find({'member_of':ObjectId(app_id)}) @@ -182,7 +179,6 @@ def page(request, group_id, app_id=None): # rcs content ends here - return render_to_response("ndf/page_list.html", {'title': title, 'appId':app._id, @@ -193,16 +189,16 @@ def page(request, group_id, app_id=None): }, context_instance=RequestContext(request) ) - - elif group_info == "PUBLIC" or group_info == "PRIVATE" or group_info is None: - """ - Below query returns only those documents: - (a) which are pages, - (b) which belongs to given group, - (c) which has status either as DRAFT or PUBLISHED, and - (d) which has access_policy either as PUBLIC or if PRIVATE then it's created_by must be the logged-in user - """ - page_nodes = node_collection.find({'member_of': {'$all': [ObjectId(app_id)]}, + + elif group_info == "PUBLIC" or group_info == "PRIVATE" or group_info is None:''' + """ + Below query returns only those documents: + (a) which are pages, + (b) which belongs to given group, + (c) which has status either as DRAFT or PUBLISHED, and + (d) which has access_policy either as PUBLIC or if PRIVATE then it's created_by must be the logged-in user + """ + page_nodes = node_collection.find({'member_of': {'$all': [ObjectId(app_id)]}, 'group_set': {'$all': [ObjectId(group_id)]}, '$or': [ {'access_policy': u"PUBLIC"}, @@ -214,14 +210,12 @@ def page(request, group_id, app_id=None): ], 'status': {'$nin': ['HIDDEN']} }).sort('last_update', -1) - - # content =[] - # for nodes in page_nodes: + # content =[] + # for nodes in page_nodes: # node,ver=get_page(request,nodes) - # if node != 'None': - # content.append(node) - - return render_to_response("ndf/page_list.html", + # if node != 'None': + # content.append(node) + return render_to_response("ndf/page_list.html", {'title': title, 'appId':app._id, 'shelf_list': shelf_list,'shelves': shelves, diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py index 718dd90..e4867b9 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/trash.py @@ -1,14 +1,13 @@ - from django.http import HttpResponse from django.shortcuts import render_to_response # , render from django.template import RequestContext from gnowsys_ndf.ndf.models import * -from gnowsys_ndf.ndf.views.page import * +from gnowsys_ndf.ndf.views.page import page +from gnowsys_ndf.ndf.views.file import file +from gnowsys_ndf.ndf.views.group import group_dashboard from gnowsys_ndf.ndf.views.methods import * - - def trash_resource(request,group_id,node_id): node = node_collection.find_one({"_id":ObjectId(node_id)}) trash_node = node_collection.find_one({"name":"Trash"}); @@ -17,12 +16,20 @@ def trash_resource(request,group_id,node_id): #fetch the tarsh group id if trash_node._id not in node.group_set: node.group_set.append(trash_node._id) - print "node",node.group_set node.save() - return (eval('page')(request, group_id)) - + get_member_of = node_collection.find_one({"_id":{'$in':node.member_of}}) + if get_member_of.name == 'Page': + return (eval('page')(request, group_id)) + elif get_member_of.name == 'File': + return(eval('file')(request, group_id)) + else: + return(eval('group_dashboard')(request, group_id)) + def delete_resource(request,group_id): node_id = request.GET.getlist('node_id','')[0] - delete_node(ObjectId(node_id),deletion_type=1) + if node_id: + delete_node(ObjectId(node_id),deletion_type=1) + else: + return HttpResponse("Nothing Deleted.") return HttpResponse("Deleted Successfully") -- cgit v1.1
Alignment & Level Curate AdvanceAdminAdminModerationTime Required Text Complexity Purge Restore Purge Restore Discuss - -
Delete
-
restore
- 		+ +
Delete
+ 		+
restore
+