requested changes

Author: bansalnitish

readthedocs/projects/forms.py

@@ -118,11 +118,8 @@ def clean_name(self):
             if project_exist:
                 project = Project.objects.get(slug=potential_slug)
                 project_url = project.get_absolute_url()
-                if project.is_abandoned:
-                    err_msg = ('Invalid project name, a <a href="{}" style="color: red">'
-                               'project</a> already exists with that name').format(project_url)
-                else:
-                    err_msg = 'Invalid project name, a project already exists with that name'
+                err_msg = ('Invalid project name, a <a href="{}" style="color: red">'
+                    'project</a> already exists with that name').format(project_url)
                 raise forms.ValidationError(mark_safe(err_msg)) # yapf: disable # noqa
         return name
 

readthedocs/projects/models.py

@@ -576,11 +576,6 @@ def is_abandoned(self):
             return False
         return True
 
-    @property
-    def is_abandoned_mail_sent(self):
-        """Is abandoned mail sent."""
-        return self.abandoned_mail_sent
-
     @property
     def is_type_sphinx(self):
         """Is project type Sphinx."""

readthedocs/projects/urls/private.py

@@ -36,9 +36,9 @@
         private.project_manage,
         name='projects_manage'),
 
-    url(r'^(?P<project_slug>[-\w]+)/send_mail/$',
-        private.send_mail,
-        name='send_mail'),
+    url(r'^(?P<project_slug>[-\w]+)/send_abandoned_mail/$',
+        private.send_abandoned_mail,
+        name='send_abandoned_mail'),
 
     url(r'^(?P<project_slug>[-\w]+)/comments_moderation/$',
         private.project_comments_moderation,

readthedocs/projects/views/private.py

@@ -8,7 +8,7 @@
 
 from allauth.socialaccount.models import SocialAccount
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.http import (
@@ -265,23 +265,21 @@ def is_advanced(self):
         return data.get('advanced', True)
 
 
-@login_required
-def send_mail(request, project_slug):
+@user_passes_test(lambda u: u.is_superuser)
+def send_abandoned_mail(request, project_slug):
     """Sends abandoned project email."""
     project = Project.objects.get(slug=project_slug)
     proj_name = project_slug
-    for user in project.users.all():
-        if AdminPermission.is_admin(user, project):
-            email = user.email
-            break
     context = {'proj_name': proj_name}
     subject = 'Rename request for abandoned project'
-    send_email(
-        recipient=email,
-        subject=subject,
-        template='projects/email/abandon_project.txt',
-        template_html='projects/email/abandon_project.html',
-        context=context)
+    for user in project.users.all():
+        email = user.email
+        send_email(
+            recipient=email,
+            subject=subject,
+            template='projects/email/abandon_project.txt',
+            template_html='projects/email/abandon_project.html',
+            context=context)
     project.abandoned_mail_sent = True
     project.save()
     return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))

readthedocs/rtd_tests/tests/test_privacy_urls.py

@@ -219,7 +219,7 @@ class PrivateProjectAdminAccessTest(PrivateProjectMixin, TestCase):
         # Places where we 302 on success -- These delete pages should probably be 405'ing
         '/dashboard/import/manual/demo/': {'status_code': 302},
         '/dashboard/pip/': {'status_code': 302},
-        '/dashboard/pip/send_mail/': {'status_code':302},
+        '/dashboard/pip/send_abandoned_mail/': {'status_code':302},
         '/dashboard/pip/subprojects/delete/sub/': {'status_code': 302},
         '/dashboard/pip/translations/delete/sub/': {'status_code': 302},
 
@@ -254,7 +254,7 @@ class PrivateProjectUserAccessTest(PrivateProjectMixin, TestCase):
 
         # Unauth access redirect for non-owners
         '/dashboard/pip/': {'status_code': 302},
-        '/dashboard/pip/send_mail/': {'status_code':302},
+        '/dashboard/pip/send_abandoned_mail/': {'status_code':302},
 
         # 405's where we should be POST'ing
         '/dashboard/pip/users/delete/': {'status_code': 405},

readthedocs/templates/core/project_bar_base.html

@@ -26,8 +26,8 @@ <h1>
 
     {% if project.is_abandoned and request.user.is_superuser %}
       <div class="abandon=project">
-        {% if not project.is_abandoned_mail_sent %}
-          <form action="{% url "send_mail" project.slug %}" method="post">
+        {% if not project.abandoned_mail_sent %}
+          <form action="{% url "send_abandoned_mail" project.slug %}" method="post">
             {% csrf_token %}
             <input type="submit" name="submit-btn" value="{% trans "Email project owner with our abandoned project email" %}"/>
           </form>