From 9eb2720f2d4e2f3dceb48d9ce3d81e8925696ce4 Mon Sep 17 00:00:00 2001
From: bee0005 <bee0005@naver.com>
Date: Fri, 2 Sep 2016 05:47:18 +0000
Subject: [PATCH] update

---
 app/controllers/application_controller.rb | 22 ++++++++++++++++++++++
 app/controllers/home_controller.rb        |  3 ++-
 app/controllers/volume_controller.rb      | 23 -----------------------
 app/views/home/index.html.erb             |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d5081c5..413f34e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,26 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   # protect_from_forgery with: :exception
+  
+  def get_conf
+    @config = Hash.new
+    output = `cat configure.conf`.split("\n")
+    output.each do |t|
+      if t.include? "project_path="
+	      @config["project_path"] = t.split("project_path=")[1]
+      elsif t.include? "server_name="
+        @config["server_name"] = t.split("server_name=")[1]
+      elsif t.include? "host_user="
+        @config["host_user"] = t.split("host_user=")[1]
+      elsif t.include? "host_ip="
+        @config["host_ip"] = t.split("host_ip=")[1]
+      elsif t.include? "host_port=" and !t.split("host_port=")[1].nil?
+        @config["host_port"] = "-p " + t.split("host_port=")[1] + " "
+      elsif t.include? "host_password="
+        @config["host_password"] = t.split("host_password=")[1]
+      end
+    end
+    return @config
+  end
+  
 end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 0dda684..4f5ddb8 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,5 +1,6 @@
 class HomeController < ApplicationController
   def index
-    puts "@@@@@@@@@@@@@@@@"
+    config = get_conf
+    @current_dir = config["project_path"]
   end
 end
diff --git a/app/controllers/volume_controller.rb b/app/controllers/volume_controller.rb
index dbb0cb2..167354c 100644
--- a/app/controllers/volume_controller.rb
+++ b/app/controllers/volume_controller.rb
@@ -1,5 +1,4 @@
 class VolumeController < ApplicationController
-  helper_method :file_directory
   
   def index
     @config = get_conf
@@ -26,28 +25,6 @@ class VolumeController < ApplicationController
     end
   end
 
-  def get_conf
-    @config = Hash.new
-    
-    output = `cat configure.conf`.split("\n")
-    output.each do |t|
-      if t.include? "project_path="
-	      @config["project_path"] = t.split("project_path=")[1]
-      elsif t.include? "server_name="
-        @config["server_name"] = t.split("server_name=")[1]
-      elsif t.include? "host_user="
-        @config["host_user"] = t.split("host_user=")[1]
-      elsif t.include? "host_ip="
-        @config["host_ip"] = t.split("host_ip=")[1]
-      elsif t.include? "host_port=" and !t.split("host_port=")[1].nil?
-        @config["host_port"] = "-p " + t.split("host_port=")[1] + " "
-      elsif t.include? "host_password="
-        @config["host_password"] = t.split("host_password=")[1]
-      end
-    end
-    
-    return @config
-  end
 
   def get_info
     @config = get_conf
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 25db573..f943ab5 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -91,7 +91,7 @@
             <div class="clearfix"></div>
           </div>
               
-            <div class="x_content" <%if t!=@volumes[0]%> style="display: none;" <%end%> >
+            <div class="x_content">
               
               <div class="col-md-12 col-sm-12 col-xs-12" id="table_div">
                 <p class="text-muted font-13 m-b-30"><code>File Manager</code></p>