github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 14:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Patch/updates onedr0p (#946)

Browse source 
* Update inCinemas column to abide by the short date set in settings (#511)

* Set default port to 587 for Email Settings, should help with all the people with gmail

* set SSL to true by default
This commit is contained in:
Devin Buhl 2017-02-28 17:58:21 -05:00 • committed by GitHub
commit 6bbe55a46c
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
View file

@ -22,7 +22,8 @@ namespace NzbDrone.Core.Notifications.Email
public EmailSettings() public EmailSettings()
{ {
Port = 25; Port = 587;
Ssl = true;
} }
[FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP of Email server")] [FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP of Email server")]

13
src/UI/Cells/InCinemasCell.js
View file

@ -1,20 +1,17 @@
var TemplatedCell = require('./TemplatedCell'); var TemplatedCell = require('./TemplatedCell');
var moment = require('moment');
var FormatHelpers = require('../Shared/FormatHelpers');
var UiSettingsModel = require('../Shared/UiSettingsModel');
module.exports = TemplatedCell.extend({ module.exports = TemplatedCell.extend({
className : 'in-cinemas-cell', className : 'in-cinemas-cell',
render : function() { render : function() {
var monthNames = ["January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December"
];
this.$el.html(""); this.$el.html("");
if (this.model.get("inCinemas")) { if (this.model.get("inCinemas")) {
var cinemasDate = new Date(this.model.get("inCinemas")); var cinemasDate = this.model.get("inCinemas");
var year = cinemasDate.getFullYear(); this.$el.html(moment(cinemasDate).format(UiSettingsModel.shortDate()));
var month = monthNames[cinemasDate.getMonth()];
this.$el.html(month + " " + year); //Hack, but somehow handlebar helper does not work.
} }
return this; return this;

2
src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
View file

@ -37,7 +37,7 @@
<div class="col-md-8 col-xs-8"> <div class="col-md-8 col-xs-8">
<span class="label label-default">{{GetStatus}}</span> <span class="label label-default">{{GetStatus}}</span>
<span class="label label-default">{{inCinemas}}</span> <span class="label label-default">{{ShortDate inCinemas}}</span>
{{profile profileId}} {{profile profileId}}

4
src/UI/Shared/UiSettingsModel.js
View file

@ -8,6 +8,10 @@ var UiSettings = Backbone.Model.extend({
return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds); return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds);
}, },
shortDate : function() {
return this.get('shortDateFormat');
},
longDateTime : function(includeSeconds) { longDateTime : function(includeSeconds) {
return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds); return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds);
}, },