From 691b91a653fa11c3cd96931229dc5bee21d2920e Mon Sep 17 00:00:00 2001 From: Kedar Aitawdekar Date: Tue, 9 Jun 2015 14:32:53 +0530 Subject: Added url for under-moderation --- gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index c8867cb..bdbcdeb 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -81,6 +81,10 @@ urlpatterns = patterns('', (r'^(?P[^/]+)/mis-po', include('gnowsys_ndf.ndf.urls.mis', namespace='mis-po'), {'app_name': "MIS-PO"}), # ---end of mis + # moderation + url(r'^(?P[^/]+)/under_moderation/(?P[\w-]+)$', 'gnowsys_ndf.ndf.views.group.under_moderation', name='under_moderation'), + # ---end of moderation + # meeting app # (r'^online/', include('online_status.urls')), #for online_users. # url(r'^(?P[^/]+)/inviteusers/(?P[^/]+)','gnowsys_ndf.ndf.views.meeting.invite_meeting', name='invite_meeting'), -- cgit v1.1 From 83c91f89021d85ea266807a67282ec6abf280939 Mon Sep 17 00:00:00 2001 From: Kedar Aitawdekar Date: Wed, 10 Jun 2015 13:26:43 +0530 Subject: Updated 'under_moderation' url --- gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index bdbcdeb..48b02c2 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -82,7 +82,7 @@ urlpatterns = patterns('', # ---end of mis # moderation - url(r'^(?P[^/]+)/under_moderation/(?P[\w-]+)$', 'gnowsys_ndf.ndf.views.group.under_moderation', name='under_moderation'), + url(r'^(?P[^/]+)/under_moderation/(?P[\w-]+)$', 'gnowsys_ndf.ndf.views.moderator.under_moderation', name='under_moderation'), # ---end of moderation # meeting app -- cgit v1.1 From 2e0a6d8914a2f13195ea39b5318464ff74c32171 Mon Sep 17 00:00:00 2001 From: Kedar Aitawdekar Date: Thu, 11 Jun 2015 11:40:45 +0530 Subject: Added new entry for moderation urls --- gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index 48b02c2..0fad1de 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -66,6 +66,7 @@ urlpatterns = patterns('', (r'^(?P[^/]+)/data-review', include('gnowsys_ndf.ndf.urls.data_review')), (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')), url(r'^(?P[^/]+)/topic_details/(?P[\w-]+)', 'gnowsys_ndf.ndf.views.topics.topic_detail_view', name='topic_details'), @@ -81,10 +82,6 @@ urlpatterns = patterns('', (r'^(?P[^/]+)/mis-po', include('gnowsys_ndf.ndf.urls.mis', namespace='mis-po'), {'app_name': "MIS-PO"}), # ---end of mis - # moderation - url(r'^(?P[^/]+)/under_moderation/(?P[\w-]+)$', 'gnowsys_ndf.ndf.views.moderator.under_moderation', name='under_moderation'), - # ---end of moderation - # meeting app # (r'^online/', include('online_status.urls')), #for online_users. # url(r'^(?P[^/]+)/inviteusers/(?P[^/]+)','gnowsys_ndf.ndf.views.meeting.invite_meeting', name='invite_meeting'), -- cgit v1.1 From 59ffca7424f0f70d2a8fe641d2fb2d03cbf84575 Mon Sep 17 00:00:00 2001 From: Kedar Aitawdekar Date: Fri, 12 Jun 2015 16:34:14 +0530 Subject: New urls file moderation added --- gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py new file mode 100644 index 0000000..801d147 --- /dev/null +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py @@ -0,0 +1,25 @@ +from django.conf.urls import patterns, url + +from django.views.generic import TemplateView + +urlpatterns = patterns('gnowsys_ndf.ndf.views.moderation', + + # simple moderation having data-review view with/without page no. + url(r'^[/]$', 'moderation', name='moderation'), + + # showing the status of under moderation object + url(r'^/status/(?P[\w-]+)$', 'moderation_status', name='moderation_status'), + + # dr: data_review + url(r'^/page-no=(?P\d+)/$', 'moderation', name='moderation_dr_page'), + + # to publish resource to next/parent(if last group) moderated group + url(r'^/approve/$', 'approve_resource', name='approve_resource'), + + # # to save edited data-review row + # url(r'^/save/$', 'data_review_save', name='data_review_save'), + + # # to render search result with and without page no. + # url(r'^/search$', 'get_dr_search_result_dict', name="data_review_search"), + # url(r'^/search/search_text=(?P[^/]+)/page-no=(?P\d+)/$', 'get_dr_search_result_dict', name="data_review_search_page"), + ) \ No newline at end of file -- cgit v1.1 From bc97fdd9a6ef7603c2cb5b3737be6940b9a9c3f6 Mon Sep 17 00:00:00 2001 From: Kedar Aitawdekar Date: Sat, 13 Jun 2015 22:25:05 +0530 Subject: Added url for showing all the resources under moderation --- gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls') diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py index 801d147..927b0ee 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/moderation.py @@ -7,6 +7,9 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.moderation', # simple moderation having data-review view with/without page no. url(r'^[/]$', 'moderation', name='moderation'), + # showing the status of all objects under moderation + url(r'^/status/all-under-moderation/$', 'all_under_moderation', name='all_under_moderation'), + # showing the status of under moderation object url(r'^/status/(?P[\w-]+)$', 'moderation_status', name='moderation_status'), -- cgit v1.1