From 3836cfb40ba4bcd3b07b3a8dfb7698f24dddb3d6 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 18 Aug 2015 17:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resource_search_form.html.erb | 2 +-
 app/views/users/user_resource.html.erb         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_resource_search_form.html.erb b/app/views/users/_resource_search_form.html.erb
index 0c48514b3..725167b65 100644
--- a/app/views/users/_resource_search_form.html.erb
+++ b/app/views/users/_resource_search_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_tag( url_for(:controller => 'users',:action => 'resource_search',:id=>user.id),
               :remote=>true ,:method => 'post',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
-    <input type="text" name="search" placeholder="输入资源关键词进行" class="searchResource" />
+    <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchResource" />
     <%= hidden_field_tag(:type,type) %>
     <%= submit_tag '',:class=>'searchIcon',:style=>'border-style:none' %>
     <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 1cad8f2de..621b0c17d 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -216,7 +216,10 @@ $(".resourcesList").click(function(e) {
   function restore(){
       //上一行不为空 且链接不为空
       if( last_line != null && res_link != null && res_link != '') {
-          name = $("#res_name") ?  $("#res_name").val().trim() : $("#res_name") ;
+          name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+          if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+              return;
+          }
           if( name && name != res_name.trim()){
 
               if(confirm('确定修改为 '+name)){