Skip to content
Snippets Groups Projects
Commit ddaf550c authored by Jörn Künsemöller's avatar Jörn Künsemöller
Browse files

Merge branch 'TMSS-286' into 'master'

Resolve TMSS-286

Closes TMSS-286

See merge request !187
parents 0d19273c 694a796c
No related branches found
No related tags found
1 merge request!187Resolve TMSS-286
...@@ -18,6 +18,7 @@ ENV PATH /usr/pgsql-9.6/bin:$PATH ...@@ -18,6 +18,7 @@ ENV PATH /usr/pgsql-9.6/bin:$PATH
RUN pip3 install cython kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil django djangorestframework djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 testing.postgresql Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 djangorestframework django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet RUN pip3 install cython kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil django djangorestframework djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 testing.postgresql Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 djangorestframework django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet
# Note: nodejs now comes with npm, do not install the npm package separately, since that will be taken from the epel repo and is conflicting. # Note: nodejs now comes with npm, do not install the npm package separately, since that will be taken from the epel repo and is conflicting.
RUN echo "Installing Nodejs packages..." && \ RUN echo "Installing Nodejs packages..." && \
curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \ curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
......
...@@ -153,13 +153,13 @@ class DatatypeSerializer(serializers.ModelSerializer): ...@@ -153,13 +153,13 @@ class DatatypeSerializer(serializers.ModelSerializer):
fields = '__all__' fields = '__all__'
class DataformatSerializer(serializers.ModelSerializer): class DataformatSerializer(RelationalHyperlinkedModelSerializer):
class Meta: class Meta:
model = models.Dataformat model = models.Dataformat
fields = '__all__' fields = '__all__'
class CopyReasonSerializer(serializers.ModelSerializer): class CopyReasonSerializer(RelationalHyperlinkedModelSerializer):
class Meta: class Meta:
model = models.CopyReason model = models.CopyReason
fields = '__all__' fields = '__all__'
...@@ -201,25 +201,25 @@ class ResourceTypeSerializer(RelationalHyperlinkedModelSerializer): ...@@ -201,25 +201,25 @@ class ResourceTypeSerializer(RelationalHyperlinkedModelSerializer):
extra_fields = ['name'] extra_fields = ['name']
class FlagSerializer(serializers.ModelSerializer): class FlagSerializer(RelationalHyperlinkedModelSerializer):
class Meta: class Meta:
model = models.Flag model = models.Flag
fields = '__all__' fields = '__all__'
class SettingSerializer(serializers.ModelSerializer): class SettingSerializer(RelationalHyperlinkedModelSerializer):
class Meta: class Meta:
model = models.Setting model = models.Setting
fields = '__all__' fields = '__all__'
class ProjectCategorySerializer(serializers.ModelSerializer): class ProjectCategorySerializer(RelationalHyperlinkedModelSerializer):
class Meta: class Meta:
model = models.ProjectCategory model = models.ProjectCategory
fields = '__all__' fields = '__all__'
class PeriodCategorySerializer(serializers.ModelSerializer): class PeriodCategorySerializer(RelationalHyperlinkedModelSerializer):
class Meta: class Meta:
model = models.PeriodCategory model = models.PeriodCategory
fields = '__all__' fields = '__all__'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment