fix(ui): load version without remote filter if no repository linked (#…

…1591) Signed-off-by: Benjamin Coenen <benjamin.coenen@corp.ovh.com>
ovh · Nov 28, 2017 · a1798d6 · a1798d6
1 parent f90cd50
commit a1798d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/engine/api/workflowv0/workflow.go b/engine/api/workflowv0/workflow.go
@@ -301,9 +301,9 @@ func LoadCDTree(db gorp.SqlExecutor, store cache.Store, projectkey, appName stri
 									pipeline.LoadPipelineBuildOpts.WithBranchName(branchName),
 								}
 
-								if remote == "" || remote == root.Application.RepositoryFullname {
+								if remote == "" || (root.Application.RepositoryFullname != "" && remote == root.Application.RepositoryFullname) {
 									opts = append(opts, pipeline.LoadPipelineBuildOpts.WithEmptyRemote(root.Application.RepositoryFullname))
-								} else {
+								} else if root.Application.RepositoryFullname != "" && remote != "" {
 									opts = append(opts, pipeline.LoadPipelineBuildOpts.WithRemoteName(remote))
 								}
 
@@ -319,9 +319,9 @@ func LoadCDTree(db gorp.SqlExecutor, store cache.Store, projectkey, appName stri
 								pipeline.LoadPipelineBuildOpts.WithBranchName(branchName),
 							}
 
-							if remote == "" || remote == root.Application.RepositoryFullname {
+							if remote == "" || (root.Application.RepositoryFullname != "" && remote == root.Application.RepositoryFullname) {
 								opts = append(opts, pipeline.LoadPipelineBuildOpts.WithEmptyRemote(root.Application.RepositoryFullname))
-							} else {
+							} else if root.Application.RepositoryFullname != "" && remote != "" {
 								opts = append(opts, pipeline.LoadPipelineBuildOpts.WithRemoteName(remote))
 							}
 

diff --git a/ui/src/app/views/application/show/workflow/application.workflow.component.ts b/ui/src/app/views/application/show/workflow/application.workflow.component.ts
@@ -316,10 +316,8 @@ export class ApplicationWorkflowComponent implements OnInit, OnDestroy {
      */
     loadVersions(key: string, appName: string): Observable<Array<string>> {
         this.loading.version = true;
-        return this._appWorkflow.getVersions(key, appName, this.applicationFilter.branch, this.applicationFilter.remote).pipe(
-            finalize(() => {
-                this.loading.version = false;
-            }))
+        return this._appWorkflow.getVersions(key, appName, this.applicationFilter.branch || 'master', this.applicationFilter.remote)
+            .pipe(finalize(() => this.loading.version = false))
             .map((versions) => this.versions = [' ', ...versions.map((v) => v.toString())]);
 
     }