Skip to content

Commit

Permalink
Filtering for active programmes in the home page and bumping version
Browse files Browse the repository at this point in the history
  • Loading branch information
Iago Veloso committed Jul 13, 2017
1 parent 129f5f2 commit bfe3e08
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 3 deletions.
39 changes: 39 additions & 0 deletions docs/source/upgrade/3.2.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
###################
3.2.2 release notes
###################

*******************
What's new in 3.2.2
*******************

* Fixing bug that made impossible deleting inline objects.
* Removing undocumented switch user functionality.
* Tweaking calendar css to improve readability.
* Filtering for active programmes in the home page.

Thanks to `@beaulalume <https://github.com/beaulalume>`_ for reporting the previous issues.


********************
How this affects you
********************

If you’re starting with a new installation, you don’t need to worry about this.
Don’t even bother reading this section; it’s for upgraders.

You need to replace your current source with the content of https://github.com/iago1460/django-radio.
To setup your settings please read the configuration section.

You should be able to keep your current database but make sure to create a backup before start.

.. code-block:: bash
python manage.py collectstatic
Or if you are using our docker setup:

.. code-block:: bash
inv docker.clean -e staging
inv docker.setup -e staging
1 change: 1 addition & 0 deletions docs/source/upgrade/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ on any process that makes changes to your database.
3.1
3.2
3.2.1
3.2.2
2 changes: 1 addition & 1 deletion radioco/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.


__version__ = '3.2.1'
__version__ = '3.2.2'
3 changes: 2 additions & 1 deletion radioco/apps/radioco/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from django.contrib.auth import (
logout,
)
from django.db.models import Q
from django.http import HttpResponseRedirect
from django.shortcuts import render
from django.utils import timezone
Expand Down Expand Up @@ -55,7 +56,7 @@ def index(request):
except StopIteration:
pass

other_programmes = Programme.objects.order_by('?').all()[:10]
other_programmes = Programme.objects.filter(Q(end_date__gte=now) | Q(end_date__isnull=True)).order_by('?').all()[:10]
latest_episodes = Episode.objects.filter(podcast__isnull=False).select_related('programme').order_by('-issue_date')[:5]

context = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@

function dismissAddRelatedObjectPopup(win, newId, newRepr) {
// Refreshing related information depending on the object type
debugger;
var name = windowname_to_id(win.name);
var view = $('#calendar').fullCalendar('getView');
if (name === 'change_programme') {
Expand Down

0 comments on commit bfe3e08

Please sign in to comment.