Skip to content
Browse files

get project features to pass

  • Loading branch information...
1 parent d432d91 commit 901a5ff0d244042bede200db7ed844cb40b0d291 @lrbalt lrbalt committed May 12, 2012
View
2 app/assets/javascripts/tracks.js
@@ -726,7 +726,7 @@ var ProjectListPage = {
var highlight = function(){
$('h2#project_name').effect('highlight', {}, 500);
};
- $.post(relative_to_root('projects/update/'+project_id), {
+ $.post(relative_to_root('projects/'+project_id), {
'project[name]': value,
'update_project_name': 'true',
'_method': 'put'
View
2 app/controllers/application_controller.rb
@@ -84,7 +84,7 @@ def count_undone_todos_phrase(todos_parent)
return "#{deferred_count.to_s} #{word}".html_safe
else
word = I18n.t('common.actions_midsentence', :count => count)
- return "#{count.to_s} #{word}".html_safe
+ return "#{count} #{word}".html_safe
end
end
View
14 app/helpers/projects_helper.rb
@@ -18,17 +18,17 @@ def set_element_visible(id,test)
end
def project_next_prev
- html = ''
- unless @previous_project.nil?
+ html = ""
+ if @previous_project
project_name = truncate(@previous_project.name, :length => 40, :omission => "...")
- html << link_to_project(@previous_project, "&laquo; #{project_name}")
+ html << link_to_project(@previous_project, "&laquo; #{project_name}".html_safe)
end
- html << ' | ' if @previous_project && @next_project
- unless @next_project.nil?
+ html << " | " if @previous_project && @next_project
+ if @next_project
project_name = truncate(@next_project.name, :length => 40, :omission => "...")
- html << link_to_project(@next_project, "#{project_name} &raquo;")
+ html << link_to_project(@next_project, "#{project_name} &raquo;".html_safe)
end
- html
+ html.html_safe
end
def project_next_prev_mobile
View
2 app/views/notes/create.js.erb
@@ -17,7 +17,7 @@ function clear_form() {
}
function html_for_error_messages() {
- return "<%= escape_javascript(error_messages_for('project')) %>";
+ return "<%= escape_javascript(get_list_of_error_messages_for(@note)) %>";
}
function html_for_note_summary() {
View
2 app/views/projects/_project_form.html.erb
@@ -2,7 +2,7 @@
project = project_form
%>
-<% form_for(project, :html => {
+<%= form_for(project, :html => {
:id => dom_id(project, 'edit_form'),
:class => "inline-form edit-project-form",
:method => :put }) do
View
2 app/views/projects/_project_listing.html.erb
@@ -12,7 +12,7 @@ suppress_delete_button ||= false
<div class="project_description">
<span class="<%= needsreview_class( project ) %>">
<%= link_to_project( project ) %>
- <%= " (" + count_undone_todos_and_notes_phrase(project) + ")" %>
+ <%= " (#{count_undone_todos_and_notes_phrase(project)})".html_safe %>
</span>
</div>
</div>

0 comments on commit 901a5ff

Please sign in to comment.
Something went wrong with that request. Please try again.