Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/application_controller.rb

@@ -372,7 +372,8 @@ class ApplicationController < ActionController::Base
         return true
     end
 
-    if allowed
+
+    if allowed || (params[:type] && params[:type] == "wechat" )
       true
     else
       if @project && @project.archived?

app/controllers/attachments_controller.rb

@@ -130,7 +130,12 @@ class AttachmentsController < ApplicationController
   def download
     # modify by nwb
     # 下载添加权限设置
-    candown = attachment_candown @attachment
+    if (params[:type] && params[:type] == "wechat" )
+      candown = true
+    else
+      candown = attachment_candown @attachment
+    end
+
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       if stale?(:etag => @attachment.digest)
         if params[:preview] == 'true'
@@ -710,7 +715,7 @@ class AttachmentsController < ApplicationController
   def has_login
     unless (@attachment && @attachment.container_type == "Organization").nil?
       unless (@attachment && @attachment.container_type == "PhoneAppVersion").nil?
-        render_403 if  !User.current.logged? && !(@attachment.container_type == 'OrgSubfield' && @attachment.container.organization.allow_guest_download) && !(@attachment.container_type == 'OrgDocumentComment' && @attachment.container.organization.allow_guest_download)
+        render_403 if  (!User.current.logged? && !(params[:type] && params[:type] == "wechat")) && !(@attachment.container_type == 'OrgSubfield' && @attachment.container.organization.allow_guest_download) && !(@attachment.container_type == 'OrgDocumentComment' && @attachment.container.organization.allow_guest_download)
       end
     end
   end

app/helpers/application_helper.rb

@@ -417,11 +417,11 @@ module ApplicationHelper
     end
     # status_id：3、已解决 5、已关闭
     if issue.status_id == 3
-      s = link_to text, issue_path(issue), :class => "text_line_s", :title => title
+      s = link_to text, issue_path(issue), :class => "text_line_s fl", :title => title
     elsif issue.status_id == 5
-      s = link_to text, issue_path(issue), :class => "text_line_s del_line", :title => title
+      s = link_to text, issue_path(issue), :class => "text_line_s del_line fl", :title => title
     else
-      s = link_to text, issue_path(issue), :class => "c_blue", :title => title
+      s = link_to text, issue_path(issue), :class => "c_blue fl", :title => title
     end
     s << h("<span style='width:450px;display:inline-block;' class='hidden'>: #{subject}</span>".html_safe) if subject
     s = h("#{issue.project} - ") + s if options[:project]
@@ -840,7 +840,7 @@ module ApplicationHelper
 
   # 必须是项目成员，项目必须提交过代码
   def allow_pull_request project
-    return false if project.gpid.nil?
+    return 0 if project.gpid.nil?
     g = Gitlab.client
     count = g.user_static(project.gpid, :rev => "master").count
     count

app/views/versions/index.html.erb

@@ -47,7 +47,7 @@
                         <% issues.each do |issue| -%>
                             <li style="overflow:hidden">
                               <%= link_to_issue_version(issue, :project => (@project != issue.project)) %>
-                              <span class="mr5 fr" >指派给：<%= link_to "#{User.find(issue.try(:assigned_to_id)).show_name}", user_path(issue.try(:assigned_to_id)), :class => "c_blue hidden" %></span>
+                              <span class="mr5 fr" >指派给：<%= link_to "#{User.find(issue.try(:assigned_to_id)).show_name}", user_path(issue.try(:assigned_to_id)), :class => "c_blue hidden fr", :style => "width:50px;" %></span>
                             </li>
                         <% end -%>
                       </ul>

public/assets/wechat/class.html

@@ -230,7 +230,7 @@
     </div>
 
     <div ng-class="{'undis': !showResources}">
-        <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r,1)">发送</a><div class="cl"></div></div>
+        <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /><a ng-href="{{g_localhost}}/attachments/download/{{r.id}}/{{r.filename}}?type=wechat" target="_blank" class="fl ml10 resource-width">{{r.filename}}</a><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r,1)">发送</a><div class="cl"></div></div>
         <p ng-show="resources_tag == true && resources.length<=0" class="class-test-tip">暂无课件，<br />
             请登录Trustie网站，在PC浏览器中上传课件。</p>
     </div>

public/assets/wechat/myresource.html

@@ -12,7 +12,7 @@
 
     <div ng-class="{'undis': currentTab!=1}">
         <div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]">
-            <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+            <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <a ng-href="{{g_localhost}}/attachments/download/{{r.id}}/{{r.filename}}?type=wechat" target="_blank" class="fl ml10 resource-width">{{r.filename}}</a><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div>
         </div>
         <div ng-if="has_more">

public/javascripts/wechat/controllers/class.js

@@ -6,6 +6,9 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
     };
 
     var vm = $scope;
+
+    vm.g_localhost = window.g_localhost;
+
     var courseid = $routeParams.id;
     var tag = $routeParams.tag;
 

public/javascripts/wechat/controllers/myresource.js

@@ -3,6 +3,9 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$l
 
     var vm = $scope;
 //    vm.menus = ['课件', '作业', '测验'];
+
+    vm.g_localhost = window.g_localhost;
+
     vm.menus = ['课件', '作业'];
 
     vm.resources = [];