Coupure prévue mardi 3 Août au matin pour maintenance du serveur. Nous faisons au mieux pour que celle-ci soit la plus brève possible.

Commit f58a7432 authored by matjaz's avatar matjaz
Browse files

Merge branch 'dev' into dev_latino

Conflicts:
	workflows/static/css/images/help.png
	workflows/static/css/jquery.contextmenu.css
	workflows/static/js/new-script.js
	workflows/urls.py
	workflows/views.py
parents 7b45b9eb 4381e4a7
workflows/static/css/images/help.png

3.52 KB | W: | H:

workflows/static/css/images/help.png

833 Bytes | W: | H:

workflows/static/css/images/help.png
workflows/static/css/images/help.png
workflows/static/css/images/help.png
workflows/static/css/images/help.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -63,7 +63,6 @@
.contextMenu LI.runwidget A { background-image: url(images/control_play.png); }
.contextMenu LI.widgetproperties A { background-image: url(images/control_play.png); }
.contextMenu LI.runtree A { background-image: url(images/control_play_all.png); }
.contextMenu LI.configuration A { background-image: url(images/page_config_edit.png); }
.contextMenu LI.resetwidget A { background-image: url(images/reset_widget.png); }
.contextMenu LI.resetworkflow A { background-image: url(images/reset_workflow.png); }
.contextMenu LI.rename A { background-image: url(images/rename.png); }
......
......@@ -366,7 +366,6 @@ function unfinishOne(widgetId) {
$(".widget"+widgetId+"progress").hide();
executed[widgetId]=false;
}
function unfinishDescendants(widgetId) {
for (c in connections) {
if (connections[c].outputWidget==widgetId) {
......@@ -934,21 +933,6 @@ function updateWidgetListeners() {
resetWorkflow();
}
if (action=='configuration') {
var dialog = $("#widgetconfiguration-"+thisWidgetId);
if (dialog.size()==0) {
$.post(url['get-configuration'], {'widget_id':thisWidgetId}, function(data) {
$("#dialogs").append(data);
updateWidgetListeners();
fileListeners();
dialog = $("#widgetconfiguration-"+thisWidgetId);
dialog.dialog('open');
},'html');
} else {
dialog.dialog('open');
}
}
if (action=='results') {
showResults(thisWidgetId);
}
......
......@@ -889,13 +889,6 @@ def reset_widget(request):
else:
return HttpResponse(status=400)
#very ugly -- should be done somwhere else
def vacuum_db():
from django.db import connection
cursor = connection.cursor()
cursor.execute("VACUUM")
connection.close()
@login_required
def reset_workflow(request):
if request.is_ajax() or DEBUG:
......@@ -906,7 +899,6 @@ def reset_workflow(request):
resetWidget.append(w.pk)
mimetype = 'application/javascript'
data = simplejson.dumps({'resetWidget':resetWidget})
vacuum_db()
return HttpResponse(data,mimetype)
else:
return HttpResponse(status=400)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment