Skip to content

Commit

Permalink
My Settings: fixes for uib-tab changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mzazrivec committed Jun 13, 2018
1 parent 315c0bc commit ce1ae4a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/controllers/configuration_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def edit

# New tab was pressed
def change_tab
@tabform = "ui_" + params[:tab] if params[:tab] != "5"
@tabform = "ui_" + params['uib-tab'] if params['uib-tab'] != "5"
edit
render :action => "show"
end
Expand Down Expand Up @@ -350,7 +350,7 @@ def timeprofile_update
if params[:button] == "cancel"
params[:id] = @timeprofile.id.to_s
flash_to_session(_("Edit of Time Profile \"%{name}\" was cancelled by the user") % {:name => @timeprofile.description})
javascript_redirect :action => 'change_tab', :typ => "timeprofiles", :tab => 4, :id => @timeprofile.id.to_s
javascript_redirect :action => 'change_tab', :typ => "timeprofiles", 'uib-tab' => 4, :id => @timeprofile.id.to_s
elsif params[:button] == "save"
days = if params[:all_days] == 'true'
(0..6).to_a
Expand Down Expand Up @@ -385,7 +385,7 @@ def timeprofile_update
construct_edit_for_audit(@timeprofile)
AuditEvent.success(build_created_audit(@timeprofile, @edit))
flash_to_session(_("Time Profile \"%{name}\" was saved") % {:name => @timeprofile.description})
javascript_redirect(:action => 'change_tab', :typ => "timeprofiles", :tab => 4, :id => @timeprofile.id.to_s)
javascript_redirect(:action => 'change_tab', :typ => "timeprofiles", 'uib-tab' => 4, :id => @timeprofile.id.to_s)
end
end
end
Expand Down

0 comments on commit ce1ae4a

Please sign in to comment.