jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unneeded commentary tag checkboxes

Browse Source 
As per the discussion on GitHub, these will be handled instead
by the existing mechanisms of related and frequent tags.
This commit is contained in:
BrokenEagle
2020-01-16 21:37:23 +00:00
parent 82b621d87d
commit 3a422b26df
5 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/uploads_controller.rb
View File

@@ -64,8 +64,7 @@ class UploadsController < ApplicationController
file source tag_string rating status parent_id artist_commentary_title
artist_commentary_desc include_artist_commentary referer_url
md5_confirmation as_pending translated_commentary_title
translated_commentary_desc add_commentary_tag add_commentary_request_tag
add_commentary_check_tag add_partial_commentary_tag
translated_commentary_desc
]
params.require(:upload).permit(permitted_params)

5
app/logical/upload_service.rb
View File

@@ -111,11 +111,6 @@ class UploadService
if !upload.uploader.can_upload_free? || upload.upload_as_pending?
p.is_pending = true
end
p.add_tag("commentary") if upload.add_commentary_tag
p.add_tag("commentary_request") if upload.add_commentary_request_tag
p.add_tag("commentary_check") if upload.add_commentary_check_tag
p.add_tag("partial_commentary") if upload.add_partial_commentary_tag
end
end
end

4
app/views/uploads/new.html.erb
View File

@@ -49,8 +49,6 @@
<%= f.input :artist_commentary_title, as: :string, label: "Original Title", input_html: { size: 60, value: params[:artist_commentary_title] } %>
<%= f.input :artist_commentary_desc, as: :text, label: "Original Description", input_html: { size: "60x5", value: params[:artist_commentary_desc] } %>
<%= f.input :include_artist_commentary, as: :boolean, label: "Include Commentary", input_html: { checked: params[:include_artist_commentary].present? } %>
<%= f.input :add_commentary_tag, as: :boolean, label: "Add commentary tag", input_html: { checked: params[:add_commentary_tag].present? } %>
<%= f.input :add_commentary_request_tag, as: :boolean, label: "Add commentary request tag", input_html: { checked: params[:add_commentary_request_tag].present? } %>
</div>
</div>
@@ -61,8 +59,6 @@
<div class="commentary-translation" style="display: none;">
<%= f.input :translated_commentary_title, as: :string, label: "Translated Title", input_html: { size: 60, value: params[:translated_commentary_title] } %>
<%= f.input :translated_commentary_desc, as: :text, label: "Translated Description", input_html: { size: "60x5", value: params[:translated_commentary_desc] } %>
<%= f.input :add_commentary_check_tag, as: :boolean, label: "Add commentary check tag", input_html: { checked: params[:add_commentary_check_tag].present? } %>
<%= f.input :add_partial_commentary_tag, as: :boolean, label: "Add partial commentary tag", input_html: { checked: params[:add_partial_commentary_tag].present? } %>
</div>
</div>

8
db/migrate/20200114204550_add_more_commentary_to_uploads.rb
View File

@@ -1,10 +1,6 @@
class AddMoreCommentaryToUploads < ActiveRecord::Migration[6.0]
def change
add_column :uploads, :translated_commentary_title, :text
add_column :uploads, :translated_commentary_desc, :text
add_column :uploads, :add_commentary_tag, :boolean
add_column :uploads, :add_commentary_request_tag, :boolean
add_column :uploads, :add_commentary_check_tag, :boolean
add_column :uploads, :add_partial_commentary_tag, :boolean
add_column :uploads, :translated_commentary_title, :text, null: false, default: ""
add_column :uploads, :translated_commentary_desc, :text, null: false, default: ""
end
end

8
db/structure.sql
View File

@@ -3022,12 +3022,8 @@ CREATE TABLE public.uploads (
include_artist_commentary boolean,
context text,
referer_url text,
translated_commentary_title text,
translated_commentary_desc text,
add_commentary_tag boolean,
add_commentary_request_tag boolean,
add_commentary_check_tag boolean,
add_partial_commentary_tag boolean
translated_commentary_title text DEFAULT ''::text NOT NULL,
translated_commentary_desc text DEFAULT ''::text NOT NULL
);