A little formating on add series

pull/3113/head
Mark McDowall 11 years ago
parent 61e8e180fc
commit 6ea0b16585

@ -8,8 +8,15 @@ define(
'AddSeries/AddSeriesView',
'Quality/QualityProfileCollection',
'AddSeries/RootFolders/Collection',
'Series/SeriesCollection',
], function (App, Marionette, RootFolderLayout, ExistingSeriesCollectionView, AddSeriesView, qualityProfileCollection, rootFolderCollection, SeriesCollection) {
'Series/SeriesCollection'
], function (App,
Marionette,
RootFolderLayout,
ExistingSeriesCollectionView,
AddSeriesView,
QualityProfileCollection,
RootFolderCollection,
SeriesCollection) {
return Marionette.Layout.extend({
template: 'AddSeries/AddSeriesLayoutTemplate',
@ -30,12 +37,11 @@ define(
initialize: function () {
SeriesCollection.fetch();
QualityProfileCollection.fetch();
RootFolderCollection.fetch();
this.rootFolderLayout = new RootFolderLayout();
this.rootFolderLayout.on('folderSelected', this._folderSelected, this);
qualityProfileCollection.fetch();
rootFolderCollection.fetch();
},
onShow: function () {

@ -44,7 +44,6 @@ define(
}
},
_onSeriesAdded: function (options) {
if (options.series.get('path') === this.model.get('folder').path) {
this.close();
@ -54,7 +53,6 @@ define(
onRender: function () {
var self = this;
this.$el.addClass(this.className);
this.ui.seriesSearch.data('timeout', null).keyup(function () {

@ -1,6 +1,6 @@
<select class="span6 x-root-folder">
{{#each this}}
<option value="{{id}}">{{path}}</option>
<option value="{{id}}">{{path}}</option>
{{/each}}
<option value="addNew">Add a different path</option>
</select>

@ -16,20 +16,20 @@
</div>
<div class="row">
{{#if existing}}
<div class="btn pull-right add-series disabled">
Already Exists
</div>
<div class="btn pull-right add-series disabled">
Already Exists
</div>
{{else}}
<div class="btn btn-success x-add pull-right add-series">
Add
<icon class="icon-plus"></icon>
</div>
{{#unless path}}
{{> RootFolderSelectionPartial rootFolders}}
{{/unless}}
<div class='pull-right'>
{{> QualityProfileSelectionPartial qualityProfiles}}
</div>
<div class="btn btn-success x-add pull-right add-series">
Add
<icon class="icon-plus"></icon>
</div>
{{#unless path}}
{{> RootFolderSelectionPartial rootFolders}}
{{/unless}}
<div class='pull-right'>
{{> QualityProfileSelectionPartial qualityProfiles}}
</div>
{{/if}}
</div>

@ -36,6 +36,32 @@ define(
this.listenTo(this.model, 'change', this.render);
},
onRender: function () {
var defaultQuality = Config.GetValue(Config.Keys.DefaultQualityProfileId);
if (QualityProfiles.get(defaultQuality)) {
this.ui.qualityProfile.val(defaultQuality);
}
},
serializeData: function () {
var data = this.model.toJSON();
var existingSeries = SeriesCollection.where({tvdbId: this.model.get('tvdbId')});
if (existingSeries.length > 0) {
data.existing = existingSeries[0].toJSON();
}
data.qualityProfiles = QualityProfiles.toJSON();
if (!data.isExisting) {
data.rootFolders = RootFolders.toJSON();
}
return data;
},
_onConfigUpdated: function (options) {
@ -48,15 +74,6 @@ define(
Config.SetValue(Config.Keys.DefaultQualityProfileId, this.ui.qualityProfile.val());
},
onRender: function () {
var defaultQuality = Config.GetValue(Config.Keys.DefaultQualityProfileId);
if (QualityProfiles.get(defaultQuality)) {
this.ui.qualityProfile.val(defaultQuality);
}
},
_addSeries: function () {
var icon = this.ui.addButton.find('icon');
icon.removeClass('icon-plus').addClass('icon-spin icon-spinner disabled');
@ -83,26 +100,6 @@ define(
}).fail(function () {
icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
});
},
serializeData: function () {
var data = this.model.toJSON();
var existingSeries = SeriesCollection.where({tvdbId: this.model.get('tvdbId')});
if (existingSeries.length > 0) {
data.existing = existingSeries[0].toJSON();
}
data.qualityProfiles = QualityProfiles.toJSON();
if (!data.isExisting) {
data.rootFolders = RootFolders.toJSON();
}
return data;
}
});
});

Loading…
Cancel
Save