Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor regression in fake serial ui logic. Fixes#1086 #1087

Merged
merged 4 commits into from
Jan 10, 2016
Merged

minor regression in fake serial ui logic. Fixes#1086 #1087

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3232e40
test for fake-serial in new ui logic #1086
phillxnet Jan 10, 2016
db6735f
correct minor string addition syntax in serial warning #1086
phillxnet Jan 10, 2016
6c4c53b
remove reference to UUID in serial warning message #1086
phillxnet Jan 10, 2016
a3fc028
add full stop to serial warning explanation #1086
phillxnet Jan 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/rockstor/storageadmin/static/storageadmin/js/views/disks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ DisksView = Backbone.View.extend({
Handlebars.registerHelper('display_disks_tbody', function() {

var html = '',
warning = 'Disk names may change unfavourably upon reboot leading to inadvertent drive reallocation and potential data loss. This error is caused by the source of these disks such as your Hypervisor or SAN. Please ensure that disks are provided with unique serial numbers before proceeding further';
warning = 'Disk names may change unfavourably upon reboot leading to inadvertent drive reallocation and potential data loss. This error is caused by the source of these disks such as your Hypervisor or SAN. Please ensure that disks are provided with unique serial numbers before proceeding further.';

this.collection.each(function(disk, index) {
var diskName = disk.get('name'),
Expand Down Expand Up @@ -205,9 +205,9 @@ DisksView = Backbone.View.extend({

html += '</td>';
html += '<td>';
if (serial == null || serial == '' || serial == diskName) {
if (serial == null || serial == '' || serial == diskName || serial.length == 48) {
html += '<div class="alert alert-danger">' +
+ '<h4>Warning! Disk serial number or UUID is not legitimate or unique.</h4>' + warning +'</div>';
'<h4>Warning! Disk serial number is not legitimate or unique.</h4>' + warning +'</div>';
}else{
html += serial;
if (serial) {
Expand Down