Skip to content

Remove mandatory check for Instance Username for CFT Blueprint #1166

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

Merged
merged 2 commits into from
Jan 23, 2017
Merged

Remove mandatory check for Instance Username for CFT Blueprint #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d715dee
Resolve merge conflicts
Durgesh1988 Jan 23, 2017
b49a792
Remove mandatory for Instance Username for CFT
Durgesh1988 Jan 23, 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
6 changes: 3 additions & 3 deletions client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,9 @@
Configure Resource : {{key}}
</accordion-heading>
<div class="col-lg-6 col-md-6 margintop15">
<label for="cftUserName">Instance Username<span class="red">&nbsp;*</span>
<span ng-show="newBlueprintForm.cftUserName.$touched && newBlueprintForm.cftUserName.$invalid" class="inputValidationMsg">Required</span></label>
<input type="text" ng-model="bpCreate.newEnt.cftModelResources[key]" name="cftUserName" class="form-control" required/>
<label for="cftUserName">Instance Username<!--<span class="red">&nbsp;*</span>
<span ng-show="newBlueprintForm.cftUserName.$touched && newBlueprintForm.cftUserName.$invalid" class="inputValidationMsg">Required</span>--></label>
<input type="text" ng-model="bpCreate.newEnt.cftModelResources[key]" name="cftUserName" class="form-control"/>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<span class="cursor pull-right">
Expand Down
1 change: 0 additions & 1 deletion server/app/routes/v1.0/routes_authentication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ module.exports.setRoutes = function(app) {
if (req.session && req.session.user) {
next();
} else {
//checking for token authentication
var token = req.headers[appConfig.catalystAuthHeaderName];
if (token) {
AuthToken.findByToken(token, function(err, authToken) {
Expand Down