diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-24 11:18:34 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-16 11:57:57 +0000 |
commit | 79e9b89069cbde9c76b8876a2e5296cf4356830e (patch) | |
tree | 6db38c09aea9f9b2a3a57bef95bbcd24d2d427af /app | |
parent | 3ea611e73f76fca4e773deb4e953617d5588fab5 (diff) | |
download | gitlab-ce-79e9b89069cbde9c76b8876a2e5296cf4356830e.tar.gz |
Sort environments by name
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/environments/stores/environmnets_store.js.es6 | 21 | ||||
-rw-r--r-- | app/views/projects/environments/components/_environment.html.haml | 1 |
2 files changed, 19 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/stores/environmnets_store.js.es6 b/app/assets/javascripts/environments/stores/environmnets_store.js.es6 index 7f0065bca8e..8b5cb67ed37 100644 --- a/app/assets/javascripts/environments/stores/environmnets_store.js.es6 +++ b/app/assets/javascripts/environments/stores/environmnets_store.js.es6 @@ -60,14 +60,14 @@ if (environment.environment_type !== null) { const occurs = acc.find((element, index, array) => { - return element.name === environment.environment_type; + return element.environment_type === environment.environment_type; }); data["vue-isChildren"] = true; if (occurs !== undefined) { acc[acc.indexOf(occurs)].children.push(data); - acc[acc.indexOf(occurs)].children.sort(); + acc[acc.indexOf(occurs)].children.push(data).sort(this.sortByName) } else { acc.push({ name: environment.environment_type, @@ -81,11 +81,26 @@ } return acc; - }, []).sort(); + }, []).sort(this.sortByName); this.state.environments = environmentsTree; return environmentsTree; + }, + + sortByName (a,b) { + const nameA = a.name.toUpperCase(); + const nameB = b.name.toUpperCase(); + + if (nameA < nameB) { + return -1; + } + + if (nameA > nameB) { + return 1; + } + + return 0; } } })(); diff --git a/app/views/projects/environments/components/_environment.html.haml b/app/views/projects/environments/components/_environment.html.haml index 7e8bcbaa67d..6cf0c1f3999 100644 --- a/app/views/projects/environments/components/_environment.html.haml +++ b/app/views/projects/environments/components/_environment.html.haml @@ -52,6 +52,7 @@ %td.hidden-xs .pull-right{ "v-if" => "!isFolder"} =render "projects/environments/components/external_url" + =render "projects/environments/components/actions" %tr{"v-if" => "open && isFolder", "is" => "environment-item", |