Merge branch 'master' of https://github.com/Inachos/fetsite

app/models/ability.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Ability
   include CanCan::Ability
   def initialize(user)
@@ -27,7 +28,7 @@ class Ability
     
     # For Debug allow everything
     # Remove this line in production environment and for testing user management
-   # can :manage, :all     
+    can :manage, :all     
     can :addfetuser, User
     can :addfetadmin, User
     can [:show, :index], Studium

app/models/lecturer.rb

@@ -1,4 +1,6 @@
 class Lecturer < ActiveRecord::Base
-  attr_accessible :email, :name, :oid, :picture, :lva_ids
+  attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link
   has_and_belongs_to_many :lvas
+  mount_uploader :picture, PictureUploader
+  resourcify
 end