added to ability rb admins to do stuff

app/controllers/problems_controller.rb

@@ -25,7 +25,6 @@ def index
     end
     problems = Problem.filter(@current_user, session[:filters])
     @problems = problems.results
-    # @paginated_problems = 
   end
 
   #eventually this will be an AJAX call. ALSO WE NEED TO CHANGE OUR HABTM ASSOCIATION TO HAS_MANY: THROUGH SO WE CAN USE VALIDATIONS AND STUFF

app/models/ability.rb

@@ -31,8 +31,10 @@ def initialize(user)
     user ||= Instructor.new
     if user.admin?
         can :manage, Instructor
+        can :manage, Problem
+        can :manage, Collection
     end
-    if user.instructor? or user.admin?
+    if user.instructor?
         can :manage, Problem, :instructor_id => user.id
         can :read, Problem, :is_public => true
         can :read, Problem, :collection => { :is_public => true }

app/views/collections/_collections_table.html.haml

@@ -16,6 +16,6 @@
               = "Created By: " + problem.instructor.name
             %td
               - problem.collections.each do |collection|
-                = link_to "#{collection.name.truncate(20)} \n", collection_path(:id => collection.id)
+                = link_to "#{collection.name} \n", collection_path(:id => collection.id)
             %td= problem.tags.map {|tags| tags.name + ', '}.join
             %td= link_to "", remove_problem_path( :id => problem.id, :collection_id => collection), {:id => "problem_#{problem.id}", :class => 'glyphicon glyphicon-trash'}

app/views/collections/_form.html.haml

@@ -9,7 +9,7 @@
     = f.submit 'Update', class: 'btn btn-primary'
     =link_to collection_path(collection), :class => 'btn btn-default', method: :delete, :confirm => 'Delete this collection?' do
       %span.glyphicon.glyphicon-trash
-      Delete
+      Delete Collection
     =link_to export_path(:id => collection), :class => 'btn btn-default' do
       %span.glyphicon.glyphicon-export
       Export

app/views/collections/new.html.haml

@@ -2,7 +2,7 @@
   %div.table-responsive
     %h2 Create New Collection
 
-    = form_for(@collection, :html => {:class => 'form-inline'}) do |f| #magical hacks to set remote to be true when called from finalize_upload
+    = form_for(@collection, :html => {:class => 'form-inline'}) do |f|
       = f.label :name
       = f.text_field :name, :class => 'form-control'
       = f.label :description

app/views/problems/_problems_table.html.haml

@@ -42,6 +42,7 @@
         %table.table.table-striped#problems
           %thead
             %tr
+            %th
             %th Question Text
             %th Collections
             %th Tags