opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10284 from OlegZharkov/quickfix_20.09

Browse Source 
[20.09] fix folder path
This commit is contained in:
Marius van den Beek
2020-10-02 17:04:21 +02:00
committed by GitHub
parent 9a15b1a6b5 da59a4cbe8
commit dcb329be00
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/mvc/library/library-folder-view.js
+2 -2
View File
@@ -66,7 +66,7 @@ var FolderView = Backbone.View.extend({
is_admin = Galaxy.user.isAdmin();
}
var template = this.templateFolderPermissions();
this.$el.html(template({ folder: this.model, is_admin: is_admin }));
this.$el.html(template({ folder: this.model, is_admin: is_admin, root_path: getAppRoot() }));
var self = this;
$.get(`${getAppRoot()}api/folders/${self.id}/permissions?scope=current`)
@@ -204,7 +204,7 @@ var FolderView = Backbone.View.extend({
return _.template(
`<div class="library_style_container">
<div>
<a href="/library/folders/<%= folder.get("parent_id") %>">
<a href="<%- root_path %>library/folders/<%= folder.get("parent_id") %>">
<button data-toggle="tooltip" data-placement="top" title="Go back to the parent folder"
class="btn btn-secondary primary-button" type="button">
<span class="fa fa-caret-left fa-lg"/>
client/src/mvc/library/library-libraryrow-view.js
+3 -1
View File
@@ -4,6 +4,7 @@ import Backbone from "backbone";
import { Toast } from "ui/toast";
import { getGalaxyInstance } from "app";
import { linkifyHtmlElements } from "mvc/library/library-util";
import { getAppRoot } from "onload/loadConfig";
// galaxy library row view
var LibraryRowView = Backbone.View.extend({
@@ -44,6 +45,7 @@ var LibraryRowView = Backbone.View.extend({
library: library,
button_config: this.element_visibility_config,
edit_mode: this.edit_mode,
root_path: getAppRoot(),
})
);
this.$el.show();
@@ -243,7 +245,7 @@ var LibraryRowView = Backbone.View.extend({
<td style="color:grey;"><%- library.get("name") %></td>
<% } else { %>
<td>
<a href="folders/<%- library.get("root_folder_id") %>"><%- library.get("name") %></a>
<a href="<%- root_path %>library/folders/<%- library.get("root_folder_id") %>"><%- library.get("name") %></a>
</td>
<% } %>
<% if(library.get("description")) { %>