mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-23 06:45:19 -07:00
Patch/updates onedr0p (#946)
* 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:
parent
7a269efcbc
commit
6bbe55a46c
4 changed files with 12 additions and 10 deletions
|
@ -22,7 +22,8 @@ namespace NzbDrone.Core.Notifications.Email
|
|||
|
||||
public EmailSettings()
|
||||
{
|
||||
Port = 25;
|
||||
Port = 587;
|
||||
Ssl = true;
|
||||
}
|
||||
|
||||
[FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP of Email server")]
|
||||
|
|
|
@ -1,20 +1,17 @@
|
|||
var TemplatedCell = require('./TemplatedCell');
|
||||
var moment = require('moment');
|
||||
var FormatHelpers = require('../Shared/FormatHelpers');
|
||||
var UiSettingsModel = require('../Shared/UiSettingsModel');
|
||||
|
||||
module.exports = TemplatedCell.extend({
|
||||
className : 'in-cinemas-cell',
|
||||
|
||||
render : function() {
|
||||
var monthNames = ["January", "February", "March", "April", "May", "June",
|
||||
"July", "August", "September", "October", "November", "December"
|
||||
];
|
||||
|
||||
this.$el.html("");
|
||||
|
||||
if (this.model.get("inCinemas")) {
|
||||
var cinemasDate = new Date(this.model.get("inCinemas"));
|
||||
var year = cinemasDate.getFullYear();
|
||||
var month = monthNames[cinemasDate.getMonth()];
|
||||
this.$el.html(month + " " + year); //Hack, but somehow handlebar helper does not work.
|
||||
var cinemasDate = this.model.get("inCinemas");
|
||||
this.$el.html(moment(cinemasDate).format(UiSettingsModel.shortDate()));
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<div class="col-md-8 col-xs-8">
|
||||
<span class="label label-default">{{GetStatus}}</span>
|
||||
|
||||
<span class="label label-default">{{inCinemas}}</span>
|
||||
<span class="label label-default">{{ShortDate inCinemas}}</span>
|
||||
|
||||
{{profile profileId}}
|
||||
|
||||
|
|
|
@ -8,6 +8,10 @@ var UiSettings = Backbone.Model.extend({
|
|||
return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds);
|
||||
},
|
||||
|
||||
shortDate : function() {
|
||||
return this.get('shortDateFormat');
|
||||
},
|
||||
|
||||
longDateTime : function(includeSeconds) {
|
||||
return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds);
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue