Merge pull request #1653 from rahul2240/tracks

Removed datatable if there is no data

app/views/admin/booths/index.html.haml

@@ -4,9 +4,6 @@
       %h1
         Booths
         = "(#{@booths.length})" if @booths.any?
-        .pull-right
-          - if can? :create, Booth
-            = link_to 'Add Booth', new_admin_conference_booth_path(@conference.short_title), class: 'button btn btn-primary'
       %p.text-muted
         All the booth requests
 
@@ -32,6 +29,7 @@
           (
           = link_to "#{@conference.booth_limit} booths", edit_admin_conference_path(@conference.short_title)
           )
+    - if @booths.any?
       %table.table.table-striped.table-bordered.table-hover.datatable
         %thead
           %th
@@ -74,3 +72,7 @@
               %td
                 = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, booth.id),
                 class: 'btn btn-primary'
+.row
+  .col-md-12.text-right
+    - if can? :create, Booth
+      = link_to 'New Booth', new_admin_conference_booth_path(@conference.short_title), class: 'button btn btn-primary'

app/views/admin/tracks/index.html.haml

@@ -7,6 +7,7 @@
         Categorize events in your conference
 .row
   .col-md-12
+    - if @tracks.any?
       %table.table.table-hover.table-striped.table-bordered.datatable#tracks
         %thead
           %th ID
@@ -78,4 +79,4 @@
                       style: ('border-top-left-radius: 0; border-bottom-left-radius: 0;' if special_style), params: { 'schedule[track_id]' => track.id }
 .row
   .col-md-12.text-right
-    = link_to 'New Track', new_admin_conference_program_track_path(@conference.short_title), class: 'btn btn-success'
+    = link_to 'New Track', new_admin_conference_program_track_path(@conference.short_title), class: 'btn btn-primary'

spec/features/tracks_spec.rb

@@ -42,11 +42,10 @@ feature Track do
 
       expected.to change { Track.count }.by(-1)
       expect(flash).to eq('Track successfully deleted.')
-      within('table#tracks') do
+      expect(page.has_css?('table#tracks')).to be false
       expect(page.has_content?(track.name)).to be false
       expect(page.has_content?(track.description)).to be false
     end
-    end
 
     scenario 'updates a track', feature: true, js: true do
       create(:track, program_id: conference.program.id)