Merge branch 'develop'

This commit is contained in:
Ruud
2014-10-08 23:00:37 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -218,8 +218,8 @@ class Manage(Plugin):
if group['media'] and group['identifier']:
added_identifiers.append(group['identifier'])
# Add it to release and update the info (only allow media restatus to done, not to active)
fireEvent('release.add', group = group, update_info = False, allowed_restatus = ['done'])
# Add it to release and update the info
fireEvent('release.add', group = group, update_info = False)
fireEvent('movie.update', identifier = group['identifier'], on_complete = self.createAfterUpdate(folder, group['identifier']))
return addToLibrary

View File

@@ -129,7 +129,7 @@ class Release(Plugin):
if 'recent' in media.get('tags', []):
fireEvent('media.untag', media.get('_id'), 'recent', single = True)
def add(self, group, update_info = True, update_id = None, allowed_restatus = None):
def add(self, group, update_info = True, update_id = None):
try:
db = get_db()
@@ -187,7 +187,7 @@ class Release(Plugin):
release['files'] = dict((k, [toUnicode(x) for x in v]) for k, v in group['files'].items() if v)
db.update(release)
fireEvent('media.restatus', media['_id'], allowed_restatus = allowed_restatus, single = True)
fireEvent('media.restatus', media['_id'], allowed_restatus = ['done'], single = True)
return True
except: