mirror of https://github.com/rancher/ui.git
Ember 2.x fixes
This commit is contained in:
parent
ddb672e604
commit
97dcd4098b
|
|
@ -3,6 +3,12 @@ import Ember from "ember";
|
|||
export default Ember.Controller.extend({
|
||||
settings: Ember.inject.service(),
|
||||
|
||||
// currentRouteName is set by Ember.Router
|
||||
// but getting the application controller to get it is inconvenient sometimes
|
||||
currentRouteNameChanged: function() {
|
||||
this.set('app.currentRouteName', this.get('currentRouteName'));
|
||||
}.observes('currentRouteName'),
|
||||
|
||||
// GitHub auth params
|
||||
queryParams : ['error_description','state','code','isTest'],
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<div class="header">
|
||||
<h4>Issues & Documentation</h4>
|
||||
<div class="pull-right r-mb20">
|
||||
Uh oh, Find an issue? <a href="{{githubLink}}/issues/new?body={{settings.issueBody}}" class="btn btn-primary r-ml10" target="_blank">File a Bug</a>
|
||||
Uh oh, Find an issue? <a href="{{settings.issueUrl}}" class="btn btn-primary r-ml10" target="_blank">File a Bug</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -78,11 +78,11 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-sm- col-md-4 text-center">
|
||||
<a href="{{githubLink}}/issues/new?body={{settings.issueBody}}" target="_blank"><img src="{{app.baseAssets}}assets/images/help-bug.svg" width="50%" /></a>
|
||||
<a href="{{settings.issueUrl}}" target="_blank"><img src="{{app.baseAssets}}assets/images/help-bug.svg" width="50%" /></a>
|
||||
<p>
|
||||
Find a bug?
|
||||
<br/>
|
||||
<a href="{{githubLink}}/issues/new?body={{settings.issueBody}}" target="_blank">File an issue on GitHub.</a>
|
||||
<a href="{{settings.issueUrl}}" target="_blank">File an issue on GitHub.</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ export default Ember.Route.extend(Subscribe, {
|
|||
},
|
||||
|
||||
switchNamespace(namespaceId) {
|
||||
var route = window.lc('application').get('currentRouteName');
|
||||
var route = this.get('app.currentRouteName');
|
||||
var okRoutes = [
|
||||
'k8s-tab.namespaces',
|
||||
'k8s-tab.namespace.rcs.index',
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{{#unless settings.isPrivateLabel}}
|
||||
<a class="btn btn-sm btn-link" target="blank" href="{{docsBase}}">Documentation</a>
|
||||
<a class="btn btn-sm btn-link" target="blank" href="{{docsBase}}/faqs/">FAQs</a>
|
||||
<a class="btn btn-sm btn-link" target="blank" href="{{githubBase}}/issues/new?body={{settings.issueBody}}">File an Issue</a>
|
||||
<a class="btn btn-sm btn-link" target="blank" href="{{settings.issueUrl}}">File an Issue</a>
|
||||
<a class="btn btn-sm btn-link" target="blank" href="{{forumBase}}">Forums</a>
|
||||
{{/unless}}
|
||||
<div class="pull-right">
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ export default Ember.Service.extend(Ember.Evented, {
|
|||
return 'v' + this.get('app.version');
|
||||
}.property('app.version'),
|
||||
|
||||
issueBody: function() {
|
||||
issueUrl: function() {
|
||||
var str = '*Describe your issue here*\n\n\n---\n| Useful | Info |\n| :-- | :-- |\n' +
|
||||
`|Versions|Rancher \`${this.get('rancherVersion')||'-'}\` ` +
|
||||
`Cattle: \`${this.get('cattleVersion')||'-'}\` ` +
|
||||
|
|
@ -111,13 +111,14 @@ export default Ember.Service.extend(Ember.Evented, {
|
|||
}
|
||||
else
|
||||
{
|
||||
str += '|Access|`Disabled`}|\n';
|
||||
str += '|Access|`Disabled`|\n';
|
||||
}
|
||||
|
||||
str += `|Route|\`${window.lc('application').get('currentRouteName')}\`|\n`;
|
||||
str += `|Route|\`${this.get('app.currentRouteName')}\`|\n`;
|
||||
|
||||
return encodeURIComponent(str);
|
||||
}.property(),
|
||||
var url = C.EXT_REFERENCES.GITHUB + '/issues/new?body=' + encodeURIComponent(str);
|
||||
return url;
|
||||
}.property('app.currentRouteName','access.{provider,admin}','cattleVersion','rancherVersion','uiVersion'),
|
||||
|
||||
rancherVersion: Ember.computed.alias(`asMap.${C.SETTING.VERSION_RANCHER}.value`),
|
||||
composeVersion: Ember.computed.alias(`asMap.${C.SETTING.VERSION_COMPOSE}.value`),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ui",
|
||||
"version": "0.91.0",
|
||||
"version": "0.92.0",
|
||||
"private": true,
|
||||
"directories": {
|
||||
"doc": "doc",
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
"node": ">= 0.12.0"
|
||||
},
|
||||
"author": "Rancher Labs, Inc.",
|
||||
"license": "Apache 2",
|
||||
"license": "Apache-2.0",
|
||||
"devDependencies": {
|
||||
"broccoli-asset-rev": "^2.2.0",
|
||||
"ember-api-store": "^1.2.13",
|
||||
"ember-api-store": "^1.2.15",
|
||||
"ember-browserify": "^1.0.1",
|
||||
"ember-cli": "^2.3.0",
|
||||
"ember-cli-app-version": "^1.0.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue