add link for sending mail on project page

Author: bansalnitish

readthedocs/projects/forms.py

@@ -117,18 +117,13 @@ def clean_name(self):
             project_exist = Project.objects.filter(slug=potential_slug).exists()
             if project_exist:
                 project = Project.objects.get(slug=potential_slug)
-                for user in project.users.all():
-                    if user.is_superuser:
-                        email = user.email
+                project_url = project.get_absolute_url()
                 if project.is_abandoned:
-                    self.fields['abandon'] = forms.CharField(
-                        widget=forms.HiddenInput())
-                    self.fields['mail_id'] = forms.EmailField(
-                        initial=email, widget=forms.HiddenInput())
-                    self.fields['proj_name'] = forms.CharField(
-                        initial=name, widget=forms.HiddenInput())
-                raise forms.ValidationError(
-                    _('Invalid project name, a project already exists with that name'))  # yapf: disable # noqa
+                    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'
+                raise forms.ValidationError(mark_safe(err_msg)) # yapf: disable # noqa
         return name
 
     def clean_repo(self):

readthedocs/projects/migrations/0024_add_abandon_mail_sent.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2018-03-04 09:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0023_migrate-alias-slug'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='abandoned_mail_sent',
+            field=models.BooleanField(default=False),
+        ),
+      
+    ]

readthedocs/projects/models.py

@@ -83,6 +83,7 @@ class Project(models.Model):
                                    related_name='projects')
     name = models.CharField(_('Name'), max_length=255)
     slug = models.SlugField(_('Slug'), max_length=255, unique=True)
+    abandoned_mail_sent = models.BooleanField(default=False)
     description = models.TextField(_('Description'), blank=True,
                                    help_text=_('The reStructuredText '
                                                'description of the project'))
@@ -575,6 +576,11 @@ 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,6 +36,10 @@
         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]+)/comments_moderation/$',
         private.project_comments_moderation,
         name='projects_comments_moderation'),
@@ -103,10 +107,6 @@
     url(r'^(?P<project_slug>[-\w]+)/advertising/$',
         ProjectAdvertisingUpdate.as_view(),
         name='projects_advertising'),
-
-    url(r'^import/manual/send_mail/$',
-        private.send_mail,
-        name='send_mail'),
 ]
 
 domain_urls = [

readthedocs/projects/views/private.py

@@ -27,6 +27,7 @@
 from readthedocs.builds.models import Version, VersionAlias
 from readthedocs.core.mixins import ListViewWithForm, LoginRequiredMixin
 from readthedocs.core.utils import broadcast, trigger_build, send_email
+from readthedocs.core.permissions import AdminPermission
 from readthedocs.integrations.models import HttpExchange, Integration
 from readthedocs.oauth.services import registry
 from readthedocs.oauth.utils import attach_webhook, update_webhook
@@ -264,10 +265,14 @@ def is_advanced(self):
         return data.get('advanced', True)
 
 
-def send_mail(request):
+@login_required
+def send_mail(request, project_slug):
     """Sends abandoned project email."""
-    email = request.POST.get('mail_id')
-    proj_name = request.POST.get('proj_name')
+    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
     context = {'proj_name': proj_name}
     subject = 'Rename request for abandoned project'
     send_email(
@@ -276,7 +281,8 @@ def send_mail(request):
         template='projects/email/abandon_project.txt',
         template_html='projects/email/abandon_project.html',
         context=context)
-    messages.success(request, _('Mail sent!'))
+    project.abandoned_mail_sent = True
+    project.save()
     return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
 

readthedocs/templates/core/project_bar_base.html

@@ -23,6 +23,19 @@ <h1>
         <a href="{{ project.get_absolute_url }}">{{ project }}</a>
       </h1>
     </div>
+    
+    {% 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">
+            {% csrf_token %}
+            <input type="submit" name="submit-btn" value="{% trans "Email project owner with our abandoned project email" %}"/>
+          </form>
+        {% else %}
+          <p><strong>{%trans "Abandonment mail is sent to the owner of the project." %}</strong></p>
+        {% endif %}
+      </div>
+    {% endif %}
 
     <div class="options">
 

readthedocs/templates/projects/import_base.html

@@ -5,13 +5,6 @@
 
 {% block content %}
   <div class="module wizard wizard-project">
-    {% if wizard.form.fields.abandon %}
-      <form action="{% url "send_mail" %}" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="mail_id" value="{{ wizard.form.fields.mail_id.initial }}">
-        <input type="hidden" name="proj_name" value="{{ wizard.form.fields.proj_name.initial }}">
-        <input type="submit" name="submit-btn" value="{% trans "Email project owner with our abandoned project email" %}">
-    {% endif %}
     <form action="{% url "projects_import_manual" %}" method="post">
 
       {% csrf_token %}