Merge branch 'feature/datadoghq' into production

.dockerignore

@@ -0,0 +1,2 @@
+venv/
+venvlinux/

.gitignore

@@ -83,6 +83,7 @@ celerybeat-schedule
 venv/
 ENV/
 myenv/
+venvlinux/
 
 # Spyder project settings
 .spyderproject

README.md

@@ -345,6 +345,27 @@ Ejecutar tests:
 
 `docker-compose -f docker/docker-compose-test.yml up --abort-on-container-exit` 
 
+### Actualizar dataUploader
+Cada vez que exista una nueva release de dataUploader se debe actualizar la versión del submódulo del proyecto. Desde la raíz del proyecto se debe direccionar al módulo dataUploader:
+
+    cd dataUploader
+
+Actualizar vía git:
+
+    git pull origin master
+
+Volver al proyecto
+
+    cd ..
+
+Hacer commit de la actualización
+
+    git add dataUploader
+    git commit -m "Update dataUploader"
+
+Finalmente actualiar vía pip
+
+    pip install -r requirements.txt
 
 ### Opcionales
 

awsbackup/admin.py

@@ -23,7 +23,7 @@ def is_active(self, obj):
     def link(self, obj):
         if obj.url is not None:
             return mark_safe(
-                "<a href='{0}' class='btn btn-success btn-xs'><i class='fa fa-file'></i> Descargar</a>".format(
+                "<a href='{0}' class='btn btn-success btn-xs'><i class='fas fa-file'></i> Descargar</a>".format(
                     obj.url))
         else:
             return 'link was not created'

awsbackup/static/awsbackup/js/storage.js

@@ -30,9 +30,9 @@ $(document).ready(function () {
                 {
                     render: function (data, type, row) {
                         if (activeDownloadLinkData.hasOwnProperty(row[0])) {
-                            return "<a href='" + activeDownloadLinkData[row[0]].url + "' class='btn btn-success btn-xs'><i class='fa fa-file'></i> Descargar (válido hasta " + (new Date(activeDownloadLinkData[row[0]].expire_at)).toLocaleString() + ")</a>";
+                            return "<a href='" + activeDownloadLinkData[row[0]].url + "' class='btn btn-success btn-xs'><i class='fas fa-file'></i> Descargar (válido hasta " + (new Date(activeDownloadLinkData[row[0]].expire_at)).toLocaleString() + ")</a>";
                         }
-                        return "<button type='button' class='btn btn-warning btn-xs'><i class='fa fa-file'></i> Crear link de descarga</button>";
+                        return "<button type='button' class='btn btn-warning btn-xs'><i class='fas fa-file'></i> Crear link de descarga</button>";
                     },
                     createdCell: function (td, cellData, rowData, row, col) {
                         $(td).find("button.btn-warning").click(function () {
@@ -42,7 +42,7 @@ $(document).ready(function () {
                             var filename = data[0];
 
                             var currentText = $(this).html();
-                            var spinner = "<i class='fa fa-refresh fa-pulse'></i>";
+                            var spinner = "<i class='fas fa-refresh fa-pulse'></i>";
                             $(this).html(spinner + " " + currentText);
                             $.post(Urls["awsbackup:createDownloadLink"](), {
                                 bucket_name: bucketName,

awsbackup/tests/testAdmin.py

@@ -37,7 +37,7 @@ def test_is_active(self):
         self.assertFalse(self.my_model_admin.is_active(self.download_link))
 
     def test_link(self):
-        expected_url = "<a href='' class='btn btn-success btn-xs'><i class='fa fa-file'></i> Descargar</a>"
+        expected_url = "<a href='' class='btn btn-success btn-xs'><i class='fas fa-file'></i> Descargar</a>"
         expected_not_url = 'link was not created'
         object_without_url = mock.MagicMock(url=None)
         self.assertEqual(expected_url, self.my_model_admin.link(self.download_link))

bower.json

@@ -27,6 +27,7 @@
     "Leaflet.Sync": "leaflet.sync#^0.2.2",
     "bootstrap-datepicker": "^1.9.0",
     "trix": "https://github.com/basecamp/trix.git",
-    "faq-template": "https://github.com/CodyHouse/faq-template.git"
+    "faq-template": "https://github.com/CodyHouse/faq-template.git",
+    "font-awesome": "^5.15.4"
   }
 }