mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-16 04:08:08 +01:00
rebase to master to include i18n changes and fix merge conflicts
This commit is contained in:
parent
7a74025253
commit
97e8602ef9
13 changed files with 43 additions and 34 deletions
|
|
@ -11,6 +11,10 @@
|
|||
TracksPages.show_edit_errors(html_for_error_messages());
|
||||
<% end %>
|
||||
|
||||
<% if @saved
|
||||
# only add these js functions if the project is saved
|
||||
-%>
|
||||
|
||||
function update_project_list_page() {
|
||||
<% if @state_changed -%>
|
||||
remove_and_re_add_project();
|
||||
|
|
@ -82,6 +86,9 @@ function html_for_project_settings() {
|
|||
return "<%= source_view_is(:project) ? escape_javascript(render(:partial => 'project_settings', :object => @project )) : "" %>";
|
||||
}
|
||||
|
||||
<% end # if @saved
|
||||
-%>
|
||||
|
||||
function html_for_error_messages() {
|
||||
return "<%= escape_javascript(error_messages_for('project')) %>";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue