# HG changeset patch
# User Chris Cannam
# Date 1330112878 0
# Node ID 1f446682602c0ee288c3f304576a7926028d5a8c
# Parent 0ec052b8b297cf139b422fa62df2739dd12c1bda# Parent 6e80a22916e94668524aa0c2c37b736355bddfac
Merge from branch "cannam"
diff -r 0ec052b8b297 -r 1f446682602c .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Fri Feb 24 19:47:58 2012 +0000
@@ -0,0 +1,1 @@
+202986dd17e4e02b3622b65cf38f358b67a393e8 bibliography_plugin_alpha
diff -r 0ec052b8b297 -r 1f446682602c app/controllers/application_controller.rb
--- a/app/controllers/application_controller.rb Fri Sep 09 16:56:10 2011 +0100
+++ b/app/controllers/application_controller.rb Fri Feb 24 19:47:58 2012 +0000
@@ -177,14 +177,14 @@
def find_project
@project = Project.find(params[:id])
rescue ActiveRecord::RecordNotFound
- render_404
+ User.current.logged? ? render_404 : require_login
end
# Find project of id params[:project_id]
def find_project_by_project_id
@project = Project.find(params[:project_id])
rescue ActiveRecord::RecordNotFound
- render_404
+ User.current.logged? ? render_404 : require_login
end
# Find a project based on params[:project_id]
diff -r 0ec052b8b297 -r 1f446682602c app/controllers/projects_controller.rb
--- a/app/controllers/projects_controller.rb Fri Sep 09 16:56:10 2011 +0100
+++ b/app/controllers/projects_controller.rb Fri Feb 24 19:47:58 2012 +0000
@@ -89,6 +89,16 @@
@project = Project.new
@project.safe_attributes = params[:project]
+
+ # todo: luisf: this should be removed from here...
+ if params && params[:project] && !params[:project][:tag_list].nil?
+ new_tags = params[:project][:tag_list].to_s.downcase
+
+ @project.tag_list = ActionController::Base.helpers.strip_tags(new_tags)
+ end
+ # end of code to be removed
+
+
if validate_parent_id && @project.save
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
# Add current user as a project member if he is not admin
diff -r 0ec052b8b297 -r 1f446682602c app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb Fri Sep 09 16:56:10 2011 +0100
+++ b/app/helpers/projects_helper.rb Fri Feb 24 19:47:58 2012 +0000
@@ -150,9 +150,6 @@
if s != ''
a = ''
- a << "
<%= link_to l(:label_personalize_page), :action => 'page_layout' %>
+ <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
<%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %>
<% unless @project.identifier_frozen? %>
- <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info) %>
+ <%= l(:text_project_identifier_info) %>
<% end %>