PYROS-IRAP / pyros

Commit 29ecf1c651457d146a378dfae7d4c49ce9e576f3

Authored by Quentin Durand
1 parent 4b59e304
Exists in dev

fix unittest

Showing 4 changed files with 4 additions and 8 deletions   Show diff stats
Inline Side-by-side
install/install.py
  Diff comments   View file @29ecf1c
... ... @@ -48,18 +48,14 @@ def install_dependency_ubuntu(command, mode):
48 48  
49 49  
50 50 def install_required_ubuntu():
51   - install_dependency_ubuntu("ppa:fkrull/deadsnakes", 'a')
52 51 install_dependency_ubuntu("update", 'u')
53   - install_dependency_ubuntu("python-pip", 'i')
54 52 install_dependency_ubuntu("python-lxml", 'i')
55 53 install_dependency_ubuntu("libxml2-dev", 'i')
56 54 install_dependency_ubuntu("libxslt-dev", 'i')
57 55 install_dependency_ubuntu("zlib1g-dev", 'i')
58 56 install_dependency_ubuntu("update", 'u')
59 57 install_dependency_ubuntu("rabbitmq-server", 'i')
60   - install_dependency_ubuntu("mysql-server", 'i')
61   - install_dependency_ubuntu("mysql-client", 'i')
62   - install_dependency_ubuntu("libmysqlclient-dev", 'i')
  58 + #install_dependency_ubuntu("libmysqlclient-dev", 'i')
63 59  
64 60  
65 61 def install_dependency_centos(command, mode):
... ...
src/alert_manager/templates/alert_manager/alerts.html
  Diff comments   View file @29ecf1c
1   - {% extends base_template %}
  1 + {% extends "base.html" %}
2 2  
3 3 {% block title %}
4 4 Alerts
... ...
src/pyros/settings.py
  Diff comments   View file @29ecf1c
... ... @@ -100,7 +100,7 @@ ROOT_URLCONF = 'pyros.urls'
100 100 TEMPLATES = [
101 101 {
102 102 'BACKEND': 'django.template.backends.django.DjangoTemplates',
103   - 'DIRS': ['misc/templates'],
  103 + 'DIRS': [os.path.join(BASE_DIR, 'misc/templates')],
104 104 'APP_DIRS': True,
105 105 'OPTIONS': {
106 106 'context_processors': [
... ...
src/user_manager/forms.py
  Diff comments   View file @29ecf1c
... ... @@ -54,7 +54,7 @@ class PyrosUserCreationForm(forms.ModelForm):
54 54 Creates a User and a PyrosUser in DB
55 55 '''
56 56 pyros_user = PyrosUser.objects.create(username=self.cleaned_data['email'], email=self.cleaned_data['email'], country=Country.objects.all()[0],
57   - user_level=UserLevel.objects.all()[1],
  57 + user_level=UserLevel.objects.all()[0],
58 58 tel=self.cleaned_data['tel'], laboratory=self.cleaned_data['laboratory'],
59 59 address=self.cleaned_data['address'])
60 60 pyros_user.set_password(self.cleaned_data['password'])
... ...