Skip to content

Erikdev issue55 fixed #20

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

Open
erikphillips wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Erikdev issue55 fixed #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aadd559
fixed issue with hud not dismissing on error with changing system nam…
erikphillips Feb 22, 2017
acec09a
fixed issue 55 by adding error messages and dismissing hud when error…
erikphillips Feb 22, 2017
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
24 changes: 18 additions & 6 deletions control/app/components/settings/settings.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,23 @@ app.controller( "settingsController",
hud.dismiss();
uibHelper.headsupModal('Settings Changed', 'Name and or location successfully updated.');
} )
.catch( function ( err ) {
hud.dismiss();
switch ( err.status ) {
case 406:
uibHelper.headsupModal('System Not Registered', 'This system is not registered with Ourglass. Please register this device and try again.');
break;
case 500:
uibHelper.headsupModal('Internal Server Error', 'The server encountered an unexpected condition which prevented it from fulfilling the update request.');
break;
default:
uibHelper.headsupModal('Error: Unable to connect', 'Unable to connect to the system. Please check wifi connection and try again.');
break;
}

} )
} )
}
};

$scope.register = function () {
$log.debug( "Registering using code." );
Expand All @@ -32,10 +47,7 @@ app.controller( "settingsController",
} )
.catch( function ( err ) {
uibHelper.headsupModal( "Something Bad Happened!", "Could not register Ourglass system. Please try again!" );

} )
};

}


} );
} );