From 2068cd41eff4a9ea9c96b3d4d619666aefc4f2c1 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 19:08:11 +0800
Subject: [PATCH 01/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index 623c8c8..121aeaf 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -3,14 +3,12 @@ class Admin::ArchiveFilesController < OrbitAdminController
     if ArchiveSortOrder.count == 0
         ArchiveSortOrder.new('sort_order' => false).save
     end
-    if !params['order_asc'].nil?
+    if !（params['order_asc'].nil?）
         if params['order_asc'] == 'true'
             ArchiveSortOrder.first.update_attributes('sort_order' => true)
         elsif params['order_asc'] == 'false'
             ArchiveSortOrder.first.update_attributes('sort_order' => false)
         end
-    else
-        ArchiveSortOrder.first.update_attributes('sort_order' => false)
     end
     @choose = ArchiveSortOrder.first['sort_order']
     @table_fields = [:status, :category, :title, :updated_at,:last_modified,"archive.downloaded_times"]

From a03c5312127a7d8e5fa77fa1a6e0bf8e93417664 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 19:46:22 +0800
Subject: [PATCH 02/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index 121aeaf..4a39d62 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -3,7 +3,7 @@ class Admin::ArchiveFilesController < OrbitAdminController
     if ArchiveSortOrder.count == 0
         ArchiveSortOrder.new('sort_order' => false).save
     end
-    if !（params['order_asc'].nil?）
+    if !(params['order_asc'].nil?)
         if params['order_asc'] == 'true'
             ArchiveSortOrder.first.update_attributes('sort_order' => true)
         elsif params['order_asc'] == 'false'

From cb85f736b9f7bb6c9fc905a5898261da21718340 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 19:54:44 +0800
Subject: [PATCH 03/12] Update _sort_order_choose.html.erb

---
 .../admin/archive_files/_sort_order_choose.html.erb  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/archive_files/_sort_order_choose.html.erb b/app/views/admin/archive_files/_sort_order_choose.html.erb
index 9c49971..c0c32d4 100644
--- a/app/views/admin/archive_files/_sort_order_choose.html.erb
+++ b/app/views/admin/archive_files/_sort_order_choose.html.erb
@@ -1,10 +1,18 @@
+<script>
+function change_order(){
+    var value = $("input[name='order_asc']")[0].checked
+    $("input[name='order_asc']").val(String(value))
+    document.order_form.submit()
+}
+</script>
 <form method="get" action='?' name='order_form'>
+<input type='hidden' name='order_asc' value=''>
 <nobr>
 <%= t('archive.choose_order')+':' %>
 <% if @choose %>
-<input type="checkbox" name="order_asc" value="false" onchange='document.order_form.submit()' checked><span><%= t('archive.yes') %></span>
+<input type="checkbox" onchange='change_order()' checked><span><%= t('archive.yes') %></span>
 <% else %>
-<input type="checkbox" name="order_asc" value="true" onchange='document.order_form.submit()'><span><%= t('archive.no') %></span>
+<input type="checkbox" onchange='change_order()'><span><%= t('archive.no') %></span>
 <% end %>
 </nobr>
 </form>
\ No newline at end of file

From fe3e9c25b1c9cb2291bf8fc903d2a8f243ce9747 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 19:56:49 +0800
Subject: [PATCH 04/12] Update _sort_order_choose.html.erb fix error

---
 app/views/admin/archive_files/_sort_order_choose.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/archive_files/_sort_order_choose.html.erb b/app/views/admin/archive_files/_sort_order_choose.html.erb
index c0c32d4..17c0e9c 100644
--- a/app/views/admin/archive_files/_sort_order_choose.html.erb
+++ b/app/views/admin/archive_files/_sort_order_choose.html.erb
@@ -1,6 +1,6 @@
 <script>
 function change_order(){
-    var value = $("input[name='order_asc']")[0].checked
+    var value = $("form[name='order_form']").find("input[type='checkbox']")[0].checked
     $("input[name='order_asc']").val(String(value))
     document.order_form.submit()
 }

From 0948362b0947b39adefbf373ab2085b6009fc31c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:16:53 +0800
Subject: [PATCH 05/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index 4a39d62..daa532f 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -1,4 +1,8 @@
 class Admin::ArchiveFilesController < OrbitAdminController
+  def show
+    module_pages = Page.where(:module => archive).collect{|p| [p.name,p.url] }
+    puts module_pages
+  end
   def index
     if ArchiveSortOrder.count == 0
         ArchiveSortOrder.new('sort_order' => false).save

From ce16c481fe132df7a3a0bdbb4dba3b4adbe98a07 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:17:58 +0800
Subject: [PATCH 06/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index daa532f..4e5fdcb 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -1,6 +1,6 @@
 class Admin::ArchiveFilesController < OrbitAdminController
   def show
-    module_pages = Page.where(:module => archive).collect{|p| [p.name,p.url] }
+    module_pages = Page.where(:module => 'archive').collect{|p| [p.name,p.url] }
     puts module_pages
   end
   def index

From 74301f69a699a8553c9f0a047131b85b424961b9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:24:31 +0800
Subject: [PATCH 07/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index 4e5fdcb..5993cf7 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -1,7 +1,7 @@
 class Admin::ArchiveFilesController < OrbitAdminController
   def show
     module_pages = Page.where(:module => 'archive').collect{|p| [p.name,p.url] }
-    puts module_pages
+    redirect_to '/' + I18n.locale.to_s + module_pages
   end
   def index
     if ArchiveSortOrder.count == 0

From 86da89fd24f43e5deffd7a01dfe615ecdadd4a08 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:25:42 +0800
Subject: [PATCH 08/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index 5993cf7..d842a92 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -1,6 +1,6 @@
 class Admin::ArchiveFilesController < OrbitAdminController
   def show
-    module_pages = Page.where(:module => 'archive').collect{|p| [p.name,p.url] }
+    module_pages = Page.where(:module => 'archive').collect{|p| p.url}[0]
     redirect_to '/' + I18n.locale.to_s + module_pages
   end
   def index

From 94028d5eea7304974dd6d493145281052c8bbfa0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:32:26 +0800
Subject: [PATCH 09/12] Update archive_files_controller.rb

---
 app/controllers/admin/archive_files_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/archive_files_controller.rb b/app/controllers/admin/archive_files_controller.rb
index d842a92..e4873d5 100644
--- a/app/controllers/admin/archive_files_controller.rb
+++ b/app/controllers/admin/archive_files_controller.rb
@@ -1,7 +1,11 @@
 class Admin::ArchiveFilesController < OrbitAdminController
   def show
-    module_pages = Page.where(:module => 'archive').collect{|p| p.url}[0]
-    redirect_to '/' + I18n.locale.to_s + module_pages
+    module_pages = Page.where(:module => 'archive').collect{|p| p.url}
+    if module_pages.length<1
+        render :text => t('archive.no_page').to_s
+    else
+        redirect_to '/' + I18n.locale.to_s + module_pages[0]  + '?title=' + params['title'].to_s
+    end
   end
   def index
     if ArchiveSortOrder.count == 0

From 9b21e6ff557547a096c8498de620afd49e7f160c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:33:22 +0800
Subject: [PATCH 10/12] Update en.yml create translation

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 859691a..15f4593 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,7 @@
 en:
 
   archive:
+    no_page: You have to create at least one page for archive module
     choose_order: Order with ascending
     "yes": "Yes"
     "no": "No"

From 563127c735cf81cbe031b6fb2473b2ac774e7bef Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:34:27 +0800
Subject: [PATCH 11/12] Update zh_tw.yml

---
 config/locales/zh_tw.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 862c629..ddb5d8c 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -1,6 +1,7 @@
 zh_tw:
 
   archive:
+    no_page: 請至少為檔案室模組新增一頁內容頁
     choose_order: 升序排列
     "yes": 是
     "no": 否

From 3c865b7c1b4e4e056f6bc903c92b9c0d1dec8e0c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Mon, 16 Sep 2019 20:35:57 +0800
Subject: [PATCH 12/12] Update _index.html.erb

---
 app/views/admin/archive_files/_index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/archive_files/_index.html.erb b/app/views/admin/archive_files/_index.html.erb
index 1a1a58c..a474ff2 100644
--- a/app/views/admin/archive_files/_index.html.erb
+++ b/app/views/admin/archive_files/_index.html.erb
@@ -25,7 +25,7 @@
           <% end %>
       </td>
       <td>
-        <a href="#" target="_blank"><%= archive.title %></a>
+        <a href="/admin/archive_files/show?title=<%= archive.title %>" target="_blank"><%= archive.title %></a>
         <div class="quick-edit">
           <ul class="nav nav-pills">
             <% if can_edit_or_delete?(archive) %>