Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-08 05:32:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1819 from C-Otto/cleanup

Browse source 
Cleanup
This commit is contained in:
Dan Rice 2015-06-16 20:47:44 -04:00
commit 2c36e22a18
5 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/projects_controller.rb
View file

@ -231,6 +231,7 @@ class ProjectsController < ApplicationController
elsif boolean_param('update_default_tags')
template = 'projects/update_default_tags'
elsif boolean_param('update_project_name')
# clicking on a project name in the project view gives a form triggering this
@projects = current_user.projects
template = 'projects/update_project_name'
else

1
app/views/projects/update.js.erb
View file

@ -28,7 +28,6 @@ var <%=object_name%> = {
<% end -%>
ProjectListPage.update_all_states_count(<%=@active_projects_count%>, <%=@hidden_projects_count%>, <%=@completed_projects_count%>);
ProjectListPage.show_or_hide_all_state_containers(<%= @show_active_projects %>, <%= @show_hidden_projects %>, <%= @show_completed_projects %>);
TracksForm.set_project_name_and_default_project_name("<%= escape_javascript(@project.name)%>");
$('div.project-edit-current').removeClass('project-edit-current');
},
update_project_page: function() {