Merge pull request #457 from fasrc/cp_cruftremoval

remove unnecessary code and imports

Author: claire-peters

Dockerfile

@@ -12,9 +12,8 @@ LABEL org.opencontainers.image.description="fasrc coldfront application"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-    && apt-get install -y redis redis-server \
+    && apt-get install -y redis redis-server vim \
     && apt-get install -y libsasl2-dev libldap2-dev libssl-dev \
-    && apt-get install -y sssd sssd-tools supervisor vim \
     && rm -rf /var/lib/apt/lists/*
 RUN mkdir ~/.ssh && echo "Host git*\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 
@@ -39,9 +38,6 @@ RUN pip install django-prometheus gunicorn
 ENV PYTHONPATH /usr/src/app:/usr/src/app/ifxreport:/usr/src/app/ifxbilling:/usr/src/app/fiine.client:/usr/src/app/ifxurls:/usr/src/app/nanites.client:/usr/src/app/ifxuser:/usr/src/app/ifxmail.client:/usr/src/app/ifxec
 
 RUN mkdir -p /usr/src/app/media/reports
-RUN printf "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list.d/backports.list && \
-    apt-get update && apt-get install libreadline7 && \
-    rm -rf /var/lib/apt/lists/*
 
 EXPOSE 80
 EXPOSE 25

coldfront/core/allocation/forms.py

@@ -201,7 +201,7 @@ class AllocationApprovalForm(forms.Form):
         label=mark_safe(
             'If you have opted for manual allocation creation, please enter the path where the '
             'allocation was created. Start it with <code>C/</code> or <code>F/</code> for lfs '
-            '(e.g., <code>C/example_lab</code>) and <code>rc_labs/</code> or '
+            '(e.g., <code>C/LABS/example_lab</code>) and <code>rc_labs/</code> or '
             '<code>c_fasse_labs/</code> for isilon (e.g., <code>rc_labs/example_lab</code>)',
         ),
         max_length=255,

coldfront/core/project/tasks.py

@@ -37,7 +37,7 @@ def send_storagereport_pdf(project, context=None):
     context = email_template_context(extra_context={
         'EMAIL_TICKET_SYSTEM_ADDRESS': EMAIL_TICKET_SYSTEM_ADDRESS,
         'project_title': title,
-        'project_detail_url': build_link(f'project/{project.pk}/')
+        'project_detail_url': build_link(f'/project/{project.pk}/')
     })
     # 1) build a fake GET request, set any necessary attributes
     factory = RequestFactory()