From fdd47ff8e1b9e1f1478e0ae695d9ce185909e691 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 17:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 11 ++++-------
 app/views/projects/che_request.js.erb  |  6 +++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c4e8410ba..c1edb82fe 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -389,13 +389,10 @@ class ProjectsController < ApplicationController
   end
 
   def che_request
-    begin
-      response = send_to_che
-      @link_ide = response["links"]["ide"]
-      Rails.logger.info("#############link_ide: #{@link_ide}")
-    rescue Exception => e
-      raise(e.backtrace.join("\n"))
-    end
+    response = send_to_che
+    @link_ide = response["links"]["ide"]
+    @message = response["message"]
+    Rails.logger.info("#############link_ide: #{@link_ide}")
   end
 
   def settings
diff --git a/app/views/projects/che_request.js.erb b/app/views/projects/che_request.js.erb
index 6f634994f..b8207ee22 100644
--- a/app/views/projects/che_request.js.erb
+++ b/app/views/projects/che_request.js.erb
@@ -1 +1,5 @@
-window.location.href = @link_ide
\ No newline at end of file
+<% if @link_ide %>
+window.location.href = <%= @link_ide %>
+<% else %>
+notice_box(<%= @message %>);
+<% end %>
\ No newline at end of file