Selaa lähdekoodia

add orders list file

abiao 4 vuotta sitten
vanhempi
commit
e278f95e53
3 muutettua tiedostoa jossa 12 lisäystä ja 16 poistoa
  1. 11 1
      app/models/ckeditor/list_file.rb
  2. 0 14
      app/models/order.rb
  3. 1 1
      lib/rails_admin/export_order_view.rb

+ 11 - 1
app/models/ckeditor/list_file.rb

@@ -25,7 +25,17 @@ class ListFile < ActiveRecord::Base
       #field :depart
       field :depart_record
 
-      field :list_file
+      field :list_file do
+        read_only true
+        pretty_value do
+          v = bindings[:view]
+          url = value
+          # value will point to bindings[:object].name
+          if value.length>0
+            v.link_to("清单文件", url, target: '_blank', rel: 'noopener noreferrer')
+          end
+        end
+      end
       field :status
       field :created_at
       # field :updated_at

+ 0 - 14
app/models/order.rb

@@ -246,20 +246,6 @@ class Order < ActiveRecord::Base
                 filterable true
             end
             field :depart_record
-            field :list_file do
-                read_only true
-                pretty_value do
-                    v = bindings[:view]
-                    url = value
-                    # value will point to bindings[:object].name
-                    if value.length>0
-                        v.link_to("文件", url, target: '_blank', rel: 'noopener noreferrer')
-                    else
-                        url="http://www.baidu.com"
-                        v.link_to("文件", url, target: '_blank', rel: 'noopener noreferrer')
-                    end
-                end
-            end
             field :created_at do
                 visible false
             end

+ 1 - 1
lib/rails_admin/export_order_view.rb

@@ -26,7 +26,7 @@ module RailsAdmin
                         n = "生成成功"
                         if not list_file.blank?
                             n = "已成功生成清单"
-                            url = "#{CONFIG_FILE["app_host"]}/railsadmin/list_file/#{@object.id}"
+                            url = "#{CONFIG_FILE["app_host"]}/railsadmin/order/list_file/#{@object.id}"
                             begin
                                 ret = RestClient.get url, {} #per_page: 5
                             rescue Exception => e