lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-12 23:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of ConferenceHolder/Conference

Browse Source
This commit is contained in:
Adrian Moennich 2017-02-23 10:47:05 +01:00
parent bb50456ba5
commit 23cc069e6d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chat/indico_chat/models/chatrooms.py
View File

@ -19,7 +19,6 @@ from __future__ import unicode_literals
from indico.core.db.sqlalchemy import db, UTCDateTime
from indico.util.date_time import now_utc
from indico.util.string import return_ascii
from MaKaC.conference import ConferenceHolder
from indico_chat.xmpp import delete_room

2
chat/indico_chat/plugin.py
View File

@ -150,7 +150,7 @@ class ChatPlugin(IndicoPlugin):
return url_for_plugin('chat.manage_rooms', event)
def event_deleted(self, event, **kwargs):
for event_chatroom in ChatroomEventAssociation.find_for_event(event.as_event, include_hidden=True):
for event_chatroom in ChatroomEventAssociation.find_for_event(event, include_hidden=True):
chatroom_deleted = event_chatroom.delete()
notify_deleted(event_chatroom.chatroom, event, None, chatroom_deleted)

5
livesync/tests/uploader_test.py
View File

@ -16,11 +16,12 @@
from mock import MagicMock, Mock
from indico.modules.events.legacy import LegacyConference
from indico_livesync import SimpleChange
from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType, EntryType
from indico_livesync.uploader import Uploader, MARCXMLUploader
from MaKaC.conference import Conference
class RecordingUploader(Uploader):
@ -60,7 +61,7 @@ def test_run_initial(mocker):
mocker.patch.object(Uploader, 'processed_records', autospec=True)
uploader = RecordingUploader(MagicMock())
uploader.INITIAL_BATCH_SIZE = 3
records = tuple(Mock(spec=Conference, id=evt_id) for evt_id in xrange(4))
records = tuple(Mock(spec=LegacyConference, id=evt_id) for evt_id in xrange(4))
uploader.run_initial(records)
# We expect two batches, with the second one being smaller (i.e. no None padding, just the events)
batches = set(records[:3]), set(records[3:])