comparison app/controllers/projects_controller.rb @ 915:2a68662d5adf cannam_integration

*needs further testing* Moved several files' extension to ".erb"; modified two files because they were calling partials/templates with rhtml extensions; renamed email templates sent when a user is added to a publication.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 02 Mar 2012 12:37:17 +0000
parents 5e80956cc792
children b03f28dd9026
comparison
equal deleted inserted replaced
914:af7a3f452778 915:2a68662d5adf
59 if User.current.logged? 59 if User.current.logged?
60 # seems sort_by gives us case-sensitive ordering, which we don't want 60 # seems sort_by gives us case-sensitive ordering, which we don't want
61 # @user_projects = User.current.projects.sort_by(&:name) 61 # @user_projects = User.current.projects.sort_by(&:name)
62 @user_projects = User.current.projects.all(:order => :name) 62 @user_projects = User.current.projects.all(:order => :name)
63 end 63 end
64 render :template => 'projects/index.rhtml', :layout => !request.xhr? 64 render :template => 'projects/index.erb', :layout => !request.xhr?
65 } 65 }
66 format.api { 66 format.api {
67 @offset, @limit = api_offset_and_limit 67 @offset, @limit = api_offset_and_limit
68 @project_count = Project.visible.count 68 @project_count = Project.visible.count
69 @projects = Project.visible.all(:offset => @offset, :limit => @limit, :order => 'lft') 69 @projects = Project.visible.all(:offset => @offset, :limit => @limit, :order => 'lft')