Fix bug.

2023-07-21 10:10:22 +08:00 · 2023-07-21 10:10:22 +08:00 · 66c6b08d76
parent 3f836c8374
commit 66c6b08d76
13 changed files with 45 additions and 17 deletions
--- a/app/controllers/admin/publications_controller.rb
+++ b/app/controllers/admin/publications_controller.rb
@ -1,8 +1,9 @@
 class Admin::PublicationsController < OrbitAdminController
+  include Admin::PublicationsHelper
  before_action :categories, only: [:index, :new, :edit]

  def index
-    @table_fields = [:title, 'publications.chapter', :pub_date, :category]
+    @table_fields = [:title, 'publications_.chapter', :pub_date, :category]
    @filter_fields = filter_fields(@categories, @tags)
    @publications = Publication.order_by(sort)
                    .with_categories(filters("category"))
--- a/app/controllers/publications_controller.rb
+++ b/app/controllers/publications_controller.rb
@ -219,7 +219,7 @@ class PublicationsController < ApplicationController
        "widget-title" => t("module_name.publication"),
        "th_keywords" => t('chapter.keywords'),
        "th_tags" => t('tags'),
-        "th_title" => t('publications.chapter'),
+        "th_title" => t('publications_.chapter'),
        "th_pub_date" => t('publication.pub_date'),
        "th_chapter_title" => t('chapter.title'),
        "th_author" => t('chapter.author'),
--- a/app/helpers/admin/publications_helper.rb
+++ b/app/helpers/admin/publications_helper.rb
@ -0,0 +1,27 @@
+module Admin::PublicationsHelper
+  def page_for_publication(publication)
+    pub_page = nil
+    pages = Page.where(:module=>'publication').select{|page| page.enabled_for.include?(I18n.locale.to_s)}
+
+    pages.each do |page|
+      if page.categories.count ==1
+        if (page.categories.include?(publication.category.id.to_s) rescue false)
+          pub_page = page
+        end
+      end
+      break if !pub_page.nil?
+    end
+
+    if pub_page.nil?
+       pages.each do |page|
+        if (page.categories.include?(publication.category.id.to_s) rescue false)
+          pub_page = page
+        end
+        break if !pub_page.nil?
+      end
+    end
+
+    pub_page = pages.first if pub_page.nil?
+    request.protocol+(request.host_with_port+pub_page.url+'/'+publication.to_param).gsub('//','/') rescue "#"
+  end
+end
--- a/app/models/chapter.rb
+++ b/app/models/chapter.rb
@ -3,7 +3,7 @@ class Chapter
  include Slug
  include OrbitTag::Taggable

-  field :title, type: String, localize: true
+  field :title, as: :slug_title, type: String, localize: true
  field :author, type: String, localize: true
  field :author_description, type: String, localize: true
  field :author_url, type: String
--- a/app/models/publication.rb
+++ b/app/models/publication.rb
@ -6,7 +6,7 @@ class Publication
  include OrbitCategory::Categorizable
  include Slug

-  field :title, type: String, localize: true
+  field :title, as: :slug_title, type: String, localize: true
  field :pub_date, type: DateTime
  field :author, type: String, localize: true
  field :author_description, type: String, localize: true
--- a/app/views/admin/publications/_index.html.erb
+++ b/app/views/admin/publications/_index.html.erb
@ -14,7 +14,7 @@
  <% @publications.each do |node| %>
    <tr>
      <td>
-        <%= link_to node.title, publication_path(node.id) %>
+        <%= link_to node.title, page_for_publication(node) %>
        <div class="quick-edit">
          <ul class="nav nav-pills">
            <% if can_edit_or_delete?(node) %>
--- a/app/views/admin/publications/_module_tag.html.erb
+++ b/app/views/admin/publications/_module_tag.html.erb
@ -49,7 +49,7 @@
            </div>
            <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
            <span class="btn btn-file">
-              <span class="fileupload-new"><%= t('publications.select_cover') %></span>
+              <span class="fileupload-new"><%= t('publications_.select_cover') %></span>
              <span class="fileupload-exists"><%= t(:change) %></span>
              <%= f.file_field :cover %>
            </span>
--- a/app/views/admin/publications/show.html.erb
+++ b/app/views/admin/publications/show.html.erb
@ -74,7 +74,7 @@
 <% if can_edit_or_delete?(@publication) %>
  <div class="bottomnav clearfix" style="left: 81px;">
    <div class="action pull-right">
-      <%= link_to t("publications.add_chapter"), new_admin_chapter_path(page: params[:page], publication_id: @publication.id), class: "btn btn-primary" %>
+      <%= link_to t("publications_.add_chapter"), new_admin_chapter_path(page: params[:page], publication_id: @publication.id), class: "btn btn-primary" %>
    </div>
   <%= content_tag :div, paginate(@chapters), class: "pagination pagination-centered" %>
  </div>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -35,7 +35,7 @@ en:
    search_placeholder: Please Input Keywords
    search: Search

-  publications:
+  publications_:
    publication: Publication
    select_cover: Select cover
    add_chapter: Add chapter
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@ -35,7 +35,7 @@ zh_tw:
    search_placeholder: 請輸入關鍵字
    search: 搜尋

-  publications:
+  publications_:
    publication: 出版品
    select_cover: 選擇封面
    add_chapter: 新增章節
--- a/lib/publications/engine.rb
+++ b/lib/publications/engine.rb
@ -26,7 +26,7 @@ module Publications
        puts ['error in publications',e]
      end
      OrbitApp.registration "Publications", :type => "ModuleApp" do
-        module_label "publications.publication"
+        module_label "publications_.publication"
        base_url File.expand_path File.dirname(__FILE__)
        # widget_methods ['widget']
        # widget_settings [{"data_count"=>30}]
@ -44,7 +44,7 @@ module Publications
        end

        side_bar do
-          head_label_i18n 'publications.publication', icon_class: "icon-book"
+          head_label_i18n 'publications_.publication', icon_class: "icon-book"
          available_for "users"
          active_for_controllers (['admin/publications'])
          head_link_path "admin_publications_path"
--- a/modules/publication/publications_index1.html.erb
+++ b/modules/publication/publications_index1.html.erb
@ -14,7 +14,7 @@
            <span class="i-annc__status-wrap" data-list="statuses" data-level="1">
              <span class="i-annc__status label status {{status-class}}">{{status}}</span>
            </span>
-            <a class="i-annc__title" href="{{link_to_show}}">{{title}}</a>
+            <a class="i-annc__title i-publication_title" href="{{link_to_show}}">{{title}}</a>
          </td>
        </tr>
    </tbody>
--- a/modules/publication/show_chapter_table.html.erb
+++ b/modules/publication/show_chapter_table.html.erb
@ -1,5 +1,5 @@
-<div class="i-annc show-chapters-table">
-<table class="i-annc__table  table table-hover table-striped">
+<div class="i-publication show-chapters-table">
+<table class="i-publication__table  table table-hover table-striped">
  <thead>
    <tr>
      <th class="col-md-2"></th>
@ -12,10 +12,10 @@
    <tr>
      <td>
        <span data-list="tags" data-level="1">
-          <span class="s-annc__tag">{{tag}}</span>
+          <span class="s-publication__tag">{{tag}}</span>
        </span>
      </td>
-      <td><a href="{{link_to_show}}">{{title}}</a></td>
+      <td><a href="{{link_to_show}}" class="i-chapter_title">{{title}}</a></td>
      <td>{{author}}</td>
      <td>{{page}}</td>
    </tr>