From 2fbdb41cb170dbc6ed6fe56e317668d6cb7edc43 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 22 Jun 2015 11:46:16 +0200 Subject: [PATCH] update media order to follow last modification date --- Dockerfile | 30 ------------------------------ teleforma/models/core.py | 5 +---- teleforma/settings.py | 0 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 Dockerfile delete mode 100644 teleforma/settings.py diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0114806b..00000000 --- a/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2014-2015 Guillaume Pellerin -# Copyright 2014-2015 Thomas Fillon -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# FROM parisson/timeside:latest-dev -FROM parisson/telemeta:latest-dev - -MAINTAINER Guillaume Pellerin , Thomas fillon - -# Clone app -RUN mkdir /opt/TeleForma -ADD . /opt/TeleForma -WORKDIR /opt/TeleForma - -# Install deps -RUN mkdir /opt/src -RUN pip install -r requirements.txt --src /opt/src - -EXPOSE 8000 diff --git a/teleforma/models/core.py b/teleforma/models/core.py index d6320b06..487ca5a2 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -292,9 +292,6 @@ class Conference(Model): self.course_type.name.lower()]) return slug - def __unicode__(self): - return self.description - def save(self, *args, **kwargs): if not self.public_id: self.public_id = get_random_hash() @@ -628,7 +625,7 @@ class Media(MediaBase): class Meta(MetaCore): db_table = app_label + '_' + 'media' - ordering = ['-conference__session', '-date_modified'] + ordering = ['-date_modified', '-conference__session'] class NamePaginator(object): diff --git a/teleforma/settings.py b/teleforma/settings.py deleted file mode 100644 index e69de29b..00000000 -- 2.39.5