Clean up after refactor.

OSC · Dec 19, 2024 · 764b6b1 · 764b6b1
1 parent eab7fbf
commit 764b6b1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/apps/dashboard/app/controllers/files_controller.rb b/apps/dashboard/app/controllers/files_controller.rb
@@ -288,7 +288,7 @@ def sort_by_column(files, column)
   def posix_file?
     @path.is_a?(PosixFile)
   end
-  
+
   def download?
     @download ||= false
   end

diff --git a/apps/dashboard/app/controllers/projects_controller.rb b/apps/dashboard/app/controllers/projects_controller.rb
@@ -2,7 +2,6 @@
 
 # The controller for project pages /dashboard/projects.
 class ProjectsController < ApplicationController
-
   # GET /projects/:id
   def show
     project_id = show_project_params[:id]
@@ -30,7 +29,7 @@ def show
       end
     end
   end
-  
+
   # GET /projects
   def index
     @projects = Project.all

diff --git a/apps/dashboard/app/helpers/projects_helper.rb b/apps/dashboard/app/helpers/projects_helper.rb
@@ -2,10 +2,10 @@
 
 # Helpers for the projects page
 module ProjectsHelper
-  include ApplicationHelper
-
+
   def render_readme(readme_location)
     file_content = File.read(readme_location)
+
     if File.extname(readme_location) == '.md'
       markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
       markdown_html = markdown.render(file_content).html_safe

diff --git a/apps/dashboard/config/routes.rb b/apps/dashboard/config/routes.rb
@@ -15,10 +15,6 @@
         post 'save', on: :member
       end
     end
-    if Configuration.can_access_files?
-      get 'projects/:project_id/directory' => 'projects#directory', as: 'project_directory'
-      get 'projects/:project_id/file' => 'projects#file', as: 'project_file'
-    end
   end
 
   # in production, if the user doesn't have access to the files app directory, we hide the routes
@@ -37,11 +33,11 @@
           :defaults => { :fs => 'fs', :format => 'json' }
     end
 
-
     post 'files/upload/:fs' => 'files#upload', :defaults => { :fs => 'fs' } if Configuration.upload_enabled?
 
     get 'files', to: redirect("files/fs#{Dir.home}")
     get 'files/fs', to: redirect("files/fs#{Dir.home}")
+
     get 'frames/directory_frame' => 'files#directory_frame', as: 'directory_frame'
     get 'frames/file_frame' => 'files#file_frame', as: 'file_frame'
 

diff --git a/apps/dashboard/lib/current_user.rb b/apps/dashboard/lib/current_user.rb
@@ -20,6 +20,7 @@ class << self
 
     alias_method :home, :dir
   end
+
   attr_reader :pwuid
   delegate :name, :uid, :gid, :gecos, :dir, :shell, to: :pwuid
 

diff --git a/apps/dashboard/test/system/project_manager_test.rb b/apps/dashboard/test/system/project_manager_test.rb
@@ -161,7 +161,6 @@ def add_auto_environment_variable(project_id, launcher_id, save: true)
     end
   end
 
-
   test 'edit a project' do
     Dir.mktmpdir do |dir|
       project_id = setup_project(dir)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ class << self @@
         alias_method :home, :dir
       end
       attr_reader :pwuid
       delegate :name, :uid, :gid, :gecos, :dir, :shell, to: :pwuid
@@ Expand Down @@