rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

This commit is contained in:
Vincent Fiduccia 2015-06-01 16:33:36 -07:00
parent 5cb92e8647
commit a008de53a7
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/authenticated/route.js
View File

@ -354,6 +354,17 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
serviceChanged: function(change) {
var service = change.data.resource;
this._includeChanged('environment', 'services', 'environmentId', change.data.resource);
// Remove the service from depenedent services
if ( ['removed','purged','purging'].indexOf(service.get('state')) >= 0 )
{
['service','loadBalancerService','dnsService','externalService'].forEach((type) => {
this.get('store').all(type).forEach((otherService) => {
(otherService.get('consumedservices')||[]).removeObject(service);
});
});
}
service.importLink('consumedservices');
},
},

2
app/components/environment-header/template.hbs
View File

@ -12,6 +12,6 @@
</div>
{{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add Service{{/link-to}}
{{#link-to "service.new-balancer" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add Balancer{{/link-to}}
{{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add DNS Name{{/link-to}}
{{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-primary right-divider-btn"}}Add DNS{{/link-to}}
</h3>
</section>

2
app/components/project-section/template.hbs
View File

@ -10,7 +10,7 @@
<span class="right-divider clip">{{#link-to "environment" model.id}}{{model.name}}{{/link-to}}</span>
{{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add Service{{/link-to}}
{{#link-to "service.new-balancer" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add Balancer{{/link-to}}
{{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add DNS Name{{/link-to}}
{{#link-to "service.new-dns" (query-params environmentId=model.id) classNames="btn btn-sm btn-default right-divider-btn"}}Add DNS{{/link-to}}
</h4>
<h6 style="margin-top: 3px;">
<span class="right-divider" tooltip="Service Count"><i class="ss-layers"></i>&nbsp;{{model.services.length}}</span>

2
app/mixins/edit-service.js
View File

@ -26,7 +26,7 @@ export default Ember.Mixin.create(EditLabels, {
// ----------------------------------
serviceChoices: function() {
var env = this.get('selectedEnvironment');
var group = 'Environment: ' + (env.get('name') || '('+env.get('id')+')');
var group = 'Project: ' + (env.get('name') || '('+env.get('id')+')');
var list = (env.get('services')||[]).map((service) => {
var serviceLabel = (service.get('name') || '('+service.get('id')+')');

2
app/service/new-dns/controller.js
View File

@ -63,7 +63,7 @@ export default Ember.ObjectController.extend(Cattle.NewOrEditMixin, {
env.get('services').map((service) => {
list.pushObject({
group: 'Environment: ' + envName,
group: 'Project: ' + envName,
id: service.get('id'),
name: service.get('name') || ('(' + service.get('id') + ')')
});

1
app/service/new/route.js
View File

@ -39,6 +39,7 @@ export default Ember.Route.extend({
serviceData = serviceOrContainer.serializeForNew();
instanceData = serviceData.launchConfig;
delete serviceData.launchConfig;
delete serviceData.instances;
}
else
{