Changeset 0d419db in observatorio

Timestamp:

Oct 17, 2014, 11:18:30 AM (10 years ago)

Author:

eparedes <eparedes@…>

Branches:

master

Children:

2355f98

Parents:

d47a15f (diff), c18d42d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://miv.cenditel.gob.ve/cadenas/scm/git/observatorio

Location:

procesos

Files:

• apps/colatareas/views.py (modified) (1 diff)
• templates/autenticar/usuario.html (modified) (1 diff)

procesos/apps/colatareas/views.py

@@ -41 +41 @@
     tarea = tareas.objects.get(id= request.GET.get("id"))
     
-    comando = "cd %s;rm -rf %s.pdf "
-    eliminar = os.system(comando %(os.path.join(settings.PATH, "tmp/"),tarea.task_id))
+    comando = "cd %s;rm -rf %s.pdf;rm -rf %s.dot "
+    eliminar = os.system(comando %(os.path.join(settings.PATH, "tmp/"),tarea.task_id,tarea.task_id))
     
     cursor.execute("DELETE FROM celery_taskmeta WHERE task_id =  %s", [tarea.task_id])

procesos/templates/autenticar/usuario.html

@@ -55 +55 @@
                 listAction: '{{BASE_URL}}/tareajson/tareajson?jtStartIndex=0&jtPageSize=10',
                 //updateAction: '{{BASE_URL}}/unidadecon_detalle/?unidadecon_id=',
-                deleteAction: '{{BASE_URL}}/tareajson/tareaborrar'
+                deleteAction: '{{BASE_URL}}/tareajson/tareaborrar?jtStartIndex=0&jtPageSize=10'
             },
             fields: {