Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 70749c46 authored by Anze Vavpetic's avatar Anze Vavpetic
Browse files

Merge branch 'dev' of workflow.ijs.si:mothra into dev

parents 2fde0a64 d85fd857
...@@ -170,6 +170,7 @@ if USE_CONCURRENCY: ...@@ -170,6 +170,7 @@ if USE_CONCURRENCY:
'django.contrib.admin', 'django.contrib.admin',
'south', 'south',
'workflows', 'workflows',
'workflows.latino',
'website', 'website',
'signuplogin', 'signuplogin',
'django_extensions', 'django_extensions',
...@@ -188,6 +189,7 @@ else: ...@@ -188,6 +189,7 @@ else:
'django.contrib.admin', 'django.contrib.admin',
'south', 'south',
'workflows', 'workflows',
'workflows.latino',
'website', 'website',
'signuplogin', 'signuplogin',
'django_extensions', 'django_extensions',
......
...@@ -33,7 +33,7 @@ class WidgetAdmin(admin.ModelAdmin): ...@@ -33,7 +33,7 @@ class WidgetAdmin(admin.ModelAdmin):
InputInline, InputInline,
OutputInline, OutputInline,
] ]
list_display = ('name','category','user') list_display = ('name','category','package','user')
class OptionInline(admin.StackedInline): class OptionInline(admin.StackedInline):
model = AbstractOption model = AbstractOption
......
import sys
from django.shortcuts import render from django.shortcuts import render
from decision_support.interaction import * from decision_support.interaction import *
from subgroup_discovery.interaction import * from subgroup_discovery.interaction import *
from workflows import packageLibImporter
def setattr_local(name, value, package):
setattr(sys.modules[__name__], name, value)
packageLibImporter.importAllPackagesLib("interaction_views",setattr_local)
def test_interaction(request,input_dict,output_dict,widget): def test_interaction(request,input_dict,output_dict,widget):
return render(request, 'interactions/test_interaction.html',{'widget':widget}) return render(request, 'interactions/test_interaction.html',{'widget':widget})
......
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
This source diff could not be displayed because it is too large. You can view the blob instead.
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