Merge pull request mastodon#91 from pixiv/fix/playlist-add-restrictio…

…ns-max-tracks DECKに入れられる最大曲数を表示
pixiv · Jun 13, 2017 · b8b43ca · b8b43ca
2 parents 5656eea + 89a93c7
commit b8b43ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/controllers/api/v1/playlists_controller.rb b/app/controllers/api/v1/playlists_controller.rb
@@ -13,6 +13,7 @@ def show
         number: params[:deck],
         time_offset: items.blank? ? 0 : @playlist.current_time_sec,
         queues: items,
+        max_queue_size: Playlist::MAX_QUEUE_SIZE,
         max_add_count: Playlist::MAX_ADD_COUNT,
         max_skip_count: Playlist::MAX_SKIP_COUNT,
       },

diff --git a/app/javascript/mastodon/features/ui/components/play_control.js b/app/javascript/mastodon/features/ui/components/play_control.js
@@ -392,14 +392,15 @@ class MusicPlayer extends React.PureComponent {
                   })()}
                 </div>
                 {(()=>{
-                  if(!this.state.deck || !this.state.deck.max_add_count || !this.state.deck.max_skip_count) return null;
+                  if(!this.state.deck || !this.state.deck.max_queue_size || !this.state.deck.max_add_count || !this.state.deck.max_skip_count) return null;
                   return (
                     <div className="queue-item__restrictions">
                       <div className="queue-item__restrictions-title">
                         <i className="fa fa-fw fa-info-circle" />
                         <span>楽曲追加・SKIPについて</span>
                       </div>
                       <ul className="queue-item__restrictions-list">
+                        <li>各DECKに<span className="queue-item__restrictions-num">最大{this.state.deck.max_queue_size}曲</span>入ります</li>
                         <li>楽曲追加は<span className="queue-item__restrictions-num">1時間に{this.state.deck.max_add_count}回まで</span>です</li>
                         <li>SKIPの回数は<span className="queue-item__restrictions-num">1時間に{this.state.deck.max_skip_count}回まで</span>です</li>
                       </ul>