From 58e5fe85c361c8934ab25b15a4b97888e3073b97 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Fri, 1 Apr 2016 21:28:25 +0800
Subject: [PATCH] =?UTF-8?q?issue=20=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/issue.rb          |  3 +++
 public/assets/wechat/issue_detail.html    | 30 +++++++++--------------
 public/javascripts/wechat/issue_detail.js |  2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb
index bc2d92b1b..de60adddf 100644
--- a/app/api/mobile/entities/issue.rb
+++ b/app/api/mobile/entities/issue.rb
@@ -24,6 +24,8 @@ module Mobile
                   IssueStatus.find(issue.status_id).name
                 when :journals_count
                   issue.journals.count
+                when :project_name
+                  issue.project.name
               end
             end
           end
@@ -38,6 +40,7 @@ module Mobile
       issue_expose :issue_assigned_to
       issue_expose :issue_status
       issue_expose :journals_count
+      issue_expose :project_name
       expose :issue_journals, using: Mobile::Entities::Journal  do |f, opt|
         if f.is_a?(::Issue)
           f.journals.where("notes != null")
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 8c326d631..e1fc8aef8 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -20,39 +20,33 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
 <script id="t:issue-detail" type="text/html">
-    <!var searchPart = window.location.search;!>
-    <!if (searchPart == ""){!>
-    <!}else{!>
-    <!var spiltSearchPart = searchPart.split("=");!>
-    <!i = parseInt(spiltSearchPart[1]);!>
-    <!}!>
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-avatar fl"><img src="<!=issues[i].author.img_url!>" width="45" height="45" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb"><!=issues[i].subject!></span></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10"><!=issues[i].author.nickname!></a>to<!=issues[i].course_project_name!>&nbsp;&nbsp;|&nbsp;&nbsp;<!=issues[i].activity_type_name!></div>
+                <div class="post-avatar fl"><img src="<!=issues.author.img_url!>" width="45" height="45" class="border-radius" /></div>
+                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb"><!=issues.subject!></span></div>
+                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10"><!=issues.author.nickname!></a>to<span class="ml10"><!=issues.project_name!>&nbsp;&nbsp;|&nbsp;&nbsp;项目缺陷</span></div>
                 <div class="cl"></div>
                 <div class="post-content" style="height:auto;">
-                    <div class="post-all-content c-grey2 mt10"><!:=issues[i].description!><br />
-                        <span class="mr15">状态：<!:=issues[i].issue_status!></span> <span class="mr15">优先级：<!:=issues[i].issue_priority!></span> <br /> <span class="mr15">指派给：<!:=issues[i].issue_assigned_to!></span>  <span class="mr15">完成度：<!:=issues[i].done_ratio!></span></div>
+                    <div class="post-all-content c-grey2 mt10"><!:=issues.description!><br />
+                        <span class="mr15">状态：<!:=issues.issue_status!></span> <span class="mr15">优先级：<!:=issues.issue_priority!></span> <br /> <span class="mr15">指派给：<!:=issues.issue_assigned_to!></span>  <span class="mr15">完成度：<!:=issues.done_ratio!>%</span></div>
                 </div>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl"><!=issues[i].created_on!></span>
+                <span  class="c-grey f13 mt10 fl"><!=issues.created_on!></span>
                 <div class="cl"></div>
             </div>
             <div class="post-interactive border-bottom">
-                <div class="post-interactive-column c-grey2">回复 (<!=issues[i].journals_count!>)</div>
+                <div class="post-interactive-column c-grey2">回复 (<!=issues.journals_count!>)</div>
                 <div class="post-interactive-column c-grey2">赞 ()</div>
             </div>
-            <! for(var j =0; j < issue.issue_journals.length; ++j){ !>
+            <! for(var j =0; j < issues.issue_journals.length; ++j){ !>
             <div class="post-reply-wrap border-bottom">
                 <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img src="<!=issue.issue_journals[j].user.img_url!>" width="45" height="45" class="border-radius" /></div>
+                    <div class="post-reply-avatar fl"><img src="<!=issues.issue_journals[j].user.img_url!>" width="45" height="45" class="border-radius" /></div>
                     <div class="ml55">
-                        <div class="post-reply-user hidden"><!=issue.issue_journals[j].user.realname!></div>
-                        <div class="post-reply-content c-grey2 mb10"><!:=issue.issue_journals[j].content!></div>
-                        <div class="post-reply-date fl"><!=issue.issue_journals[j].lasted_comment!></div>
+                        <div class="post-reply-user hidden"><!=issues.issue_journals[j].user.realname!></div>
+                        <div class="post-reply-content c-grey2 mb10"><!:=issue.issue_journals[j].notes!></div>
+                        <div class="post-reply-date fl"><!=issues.issue_journals[j].created_on!></div>
                         <div class="post-reply-trigger fr undis">回复</div>
                     </div>
                     <div class="cl"></div>
diff --git a/public/javascripts/wechat/issue_detail.js b/public/javascripts/wechat/issue_detail.js
index 2a2153062..fe2f4531f 100644
--- a/public/javascripts/wechat/issue_detail.js
+++ b/public/javascripts/wechat/issue_detail.js
@@ -77,7 +77,7 @@ $(document).ready(function(){
                 url: "前台地址/后台方法",    //提交的页面，方法名
                 data: userInfo,    //参数，如果没有，可以为null
                 success: function (data) { //如果执行成功，那么执行此方法
-                    alert(data.d);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
+                    alert(data.result);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
                 },
                 error: function (err) { //如果执行不成功，那么执行此方法
                     alert("err:" + err);