diff --git a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs index e7591f3ee..806bbf5f4 100644 --- a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs @@ -1,7 +1,6 @@ using System; using Marr.Data.Converters; using Marr.Data.Mapping; -using NzbDrone.Common.Serializer; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Converters; @@ -25,8 +24,11 @@ namespace NzbDrone.Core.Datastore.Converters SerializerSetting.Converters.Add(new StringEnumConverter { CamelCaseText = true }); SerializerSetting.Converters.Add(new VersionConverter()); + foreach (var converter in converters) + { SerializerSetting.Converters.Add(converter); + } } public virtual object FromDB(ConverterContext context) diff --git a/src/NzbDrone.Core/Datastore/Converters/QualityIntConverter.cs b/src/NzbDrone.Core/Datastore/Converters/QualityIntConverter.cs index ad07994c5..f423758f1 100644 --- a/src/NzbDrone.Core/Datastore/Converters/QualityIntConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/QualityIntConverter.cs @@ -48,7 +48,6 @@ namespace NzbDrone.Core.Datastore.Converters } } - #region JsonConverter public override bool CanConvert(Type objectType) { return objectType == typeof(Quality); @@ -64,6 +63,5 @@ namespace NzbDrone.Core.Datastore.Converters { writer.WriteValue(ToDB(value)); } - #endregion } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs b/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs index 35f9dbbb9..090ddd33a 100644 --- a/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs +++ b/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs @@ -2,7 +2,6 @@ using NzbDrone.Core.Datastore.Migration.Framework; using System.Data; using System.Linq; -using System; using NzbDrone.Common.Serializer; using NzbDrone.Core.Qualities; using System.Collections.Generic; diff --git a/src/NzbDrone.Core/Datastore/Migration/037_add_configurable_qualities.cs b/src/NzbDrone.Core/Datastore/Migration/037_add_configurable_qualities.cs index c036ee4ba..fddd8e5a5 100644 --- a/src/NzbDrone.Core/Datastore/Migration/037_add_configurable_qualities.cs +++ b/src/NzbDrone.Core/Datastore/Migration/037_add_configurable_qualities.cs @@ -2,10 +2,7 @@ using NzbDrone.Core.Datastore.Migration.Framework; using System.Data; using System.Linq; -using System; -using NzbDrone.Common.Serializer; using NzbDrone.Core.Qualities; -using System.Collections.Generic; namespace NzbDrone.Core.Datastore.Migration { diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteAlter.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteAlter.cs index c8d423a1c..848470de3 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteAlter.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteAlter.cs @@ -45,7 +45,6 @@ namespace NzbDrone.Core.Datastore.Migration.Framework var newIndexes = originalIndexes.Union(indexes); - CreateTable(tableName, columns, newIndexes); transaction.Commit(); @@ -57,7 +56,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework using (var transaction = _sqLiteMigrationHelper.BeginTransaction()) { var originalColumns = _sqLiteMigrationHelper.GetColumns(tableName); - var originalIndexes = _sqLiteMigrationHelper.GetIndexes(tableName); + var indexes = _sqLiteMigrationHelper.GetIndexes(tableName); var newColumns = originalColumns.Select(c => { @@ -82,9 +81,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework return c.Value; }).ToList(); - var newIndexes = originalIndexes; - - CreateTable(tableName, newColumns, newIndexes); + CreateTable(tableName, newColumns, indexes); transaction.Commit(); } diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 9a35534be..2997be7d5 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -150,7 +150,6 @@ namespace NzbDrone.Core.Organizer tokenValues.Add("{Episode Title}", GetEpisodeTitle(episodeTitles)); tokenValues.Add("{Quality Title}", GetQualityTitle(episodeFile.Quality)); - return CleanFilename(ReplaceTokens(pattern, tokenValues).Trim()); } diff --git a/src/UI/Config.js b/src/UI/Config.js index 797cdadb3..bbc6b54ed 100644 --- a/src/UI/Config.js +++ b/src/UI/Config.js @@ -9,8 +9,9 @@ define( }, Keys : { DefaultQualityProfileId: 'DefaultQualityProfileId', - DefaultRootFolderId: 'DefaultRootFolderId', - UseSeasonFolder: 'UseSeasonFolder' + DefaultRootFolderId : 'DefaultRootFolderId', + UseSeasonFolder : 'UseSeasonFolder', + AdvancedSettings : 'advancedSettings' }, getValueBoolean: function (key, defaultValue) { diff --git a/src/UI/Settings/Quality/Profile/EditQualityProfileItemViewTemplate.html b/src/UI/Settings/Quality/Profile/EditQualityProfileItemViewTemplate.html index f118c528b..33cc7d2f5 100644 --- a/src/UI/Settings/Quality/Profile/EditQualityProfileItemViewTemplate.html +++ b/src/UI/Settings/Quality/Profile/EditQualityProfileItemViewTemplate.html @@ -1,3 +1,3 @@ - + {{quality.name}} - + diff --git a/src/UI/Settings/Quality/Profile/EditQualityProfileView.js b/src/UI/Settings/Quality/Profile/EditQualityProfileView.js index 49e571939..a602e7dbd 100644 --- a/src/UI/Settings/Quality/Profile/EditQualityProfileView.js +++ b/src/UI/Settings/Quality/Profile/EditQualityProfileView.js @@ -1,6 +1,7 @@ 'use strict'; define( [ + 'underscore', 'vent', 'marionette', 'backbone', @@ -8,8 +9,8 @@ define( 'Settings/Quality/Profile/EditQualityProfileItemView', 'Mixins/AsModelBoundView', 'Mixins/AsValidatedView', - 'underscore' - ], function (vent, Marionette, Backbone, BackboneSortableCollectionView, EditQualityProfileItemView, AsModelBoundView, AsValidatedView, _) { + 'Config' + ], function (_, vent, Marionette, Backbone, QualitySortableCollectionView, EditQualityProfileItemView, AsModelBoundView, AsValidatedView, Config) { var view = Marionette.ItemView.extend({ template: 'Settings/Quality/Profile/EditQualityProfileViewTemplate', @@ -26,35 +27,23 @@ define( initialize: function (options) { this.profileCollection = options.profileCollection; - this.allowedCollection = new Backbone.Collection(_.toArray(this.model.get('items')).reverse()); + this.itemsCollection = new Backbone.Collection(_.toArray(this.model.get('items')).reverse()); }, onRender: function() { - var MyCollectionView = BackboneSortableCollectionView.extend({ - events : { - // Backbone.CollectionView used mousedown for the click event, which interferes with the sortable. - "click li, td" : "_listItem_onMousedown", - "dblclick li, td" : "_listItem_onDoubleClick", - "click" : "_listBackground_onClick", - "click ul.collection-list, table.collection-list" : "_listBackground_onClick", - "keydown" : "_onKeydown" - } - }); - var listViewAllowed = new MyCollectionView({ + + var listViewAllowed = new QualitySortableCollectionView({ el : this.ui.allowed, modelView : EditQualityProfileItemView, selectable : true, selectMultiple : true, clickToSelect : true, clickToToggle : true, - sortable : true, - sortableOptions : { - handle: '.x-drag-handle' - }, - collection : this.allowedCollection + sortable : Config.getValueBoolean(Config.Keys.AdvancedSettings, false), + collection : this.itemsCollection }); - listViewAllowed.setSelectedModels(this.allowedCollection.filter(function(item) { return item.get('allowed') === true; })); + listViewAllowed.setSelectedModels(this.itemsCollection.filter(function(item) { return item.get('allowed') === true; })); listViewAllowed.render(); @@ -73,7 +62,7 @@ define( }, _updateModel: function() { - this.model.set('items', this.allowedCollection.toJSON().reverse()); + this.model.set('items', this.itemsCollection.toJSON().reverse()); this.render(); }, diff --git a/src/UI/Settings/Quality/Profile/EditQualityProfileViewTemplate.html b/src/UI/Settings/Quality/Profile/EditQualityProfileViewTemplate.html index 5603f9221..619f6c873 100644 --- a/src/UI/Settings/Quality/Profile/EditQualityProfileViewTemplate.html +++ b/src/UI/Settings/Quality/Profile/EditQualityProfileViewTemplate.html @@ -29,17 +29,14 @@ - -