diff --git a/app/controllers/tracks_controller.rb b/app/controllers/tracks_controller.rb index c95aff2..00dbe58 100644 --- a/app/controllers/tracks_controller.rb +++ b/app/controllers/tracks_controller.rb @@ -24,7 +24,11 @@ def create # @track = current_user.tracks.new(track_params) @track_form.user = current_user @track_form.private = track_bulk_params[:private] - @track_form.tracks_attributes = audios.map { |o| {audio: o} } + @track_form.tracks_attributes = audios.map { |o| + { + audio: o + } + } @track_form.step = "info" else @track_form.tracks_attributes_objects = track_bulk_params[:tracks_attributes] @@ -135,7 +139,8 @@ def track_bulk_params :private, :enable_label, :step, - audio: [], tracks_attributes: [ + audio: [], + tracks_attributes: [ :audio, :cover, :title, :description, :private, tags: [] ] ) diff --git a/app/models/track_bulk_creator.rb b/app/models/track_bulk_creator.rb index 2087f1f..615115c 100644 --- a/app/models/track_bulk_creator.rb +++ b/app/models/track_bulk_creator.rb @@ -4,7 +4,11 @@ class TrackBulkCreator include ActiveModel::Model - attr_accessor :tracks_attributes, :step, :user, :make_playlist, :private + attr_accessor :tracks_attributes, + :step, + :user, + :make_playlist, + :private validate :validate_tracks @@ -36,7 +40,7 @@ def tracks @tracks ||= tracks_attributes.map do |attributes| blob = ActiveStorage::Blob.find_signed(attributes[:audio]) t = Track.new(attributes) - t.title = File.basename(blob.filename.to_s, File.extname(blob.filename.to_s)) + t.title = File.basename(blob.filename.to_s, File.extname(blob.filename.to_s)) unless t.title.present? t.user = user t.private = private t diff --git a/app/views/playlists/_playlist_item.html.erb b/app/views/playlists/_playlist_item.html.erb index 4059880..056e9a2 100644 --- a/app/views/playlists/_playlist_item.html.erb +++ b/app/views/playlists/_playlist_item.html.erb @@ -149,33 +149,9 @@ <% if playlist.price %> - - - - - - <%= number_to_currency(playlist.price, precision: 2) %> - - - USD - - - - <% if playlist.name_your_price %> - - <%= gettext("or more") %> - - <% end %> - + <%= render "shared/music_purchase", + resource: playlist, + variant: :mini %> <% end %> diff --git a/app/views/playlists/show.html.erb b/app/views/playlists/show.html.erb index 6b282db..4cfd6a0 100644 --- a/app/views/playlists/show.html.erb +++ b/app/views/playlists/show.html.erb @@ -29,6 +29,7 @@
<%= track.title %>
+ ++ <%= track.user.username %> +
+<%= track.title %>
- -- <%= track.user.username %> -
-