diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index 6cd6e36..4f10d34 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -25,15 +25,15 @@
@organisation = Org.find(params[:id])
authorize @organisation
@organisation.banner_text = params["org_banner_text"]
- @organisation.logo = params[:organisation][:logo] if params[:organisation][:logo]
- assign_params = params[:organisation].dup
+ @organisation.logo = params[:org][:logo] if params[:org][:logo]
+ assign_params = params[:org].dup
assign_params.delete(:logo)
- assign_params.delete(:contact_email) unless params[:organisation][:contact_email].present?
+ assign_params.delete(:contact_email) unless params[:org][:contact_email].present?
respond_to do |format|
begin
if @organisation.update_attributes(assign_params)
- format.html { redirect_to admin_show_organisation_path(params[:id]), notice: I18n.t("admin.org_updated_message") }
+ format.html { redirect_to admin_show_org_path(params[:id]), notice: I18n.t("admin.org_updated_message") }
else
flash[:noice] = @organisation.errors.collect{|e| e.message}.join('
').html_safe
format.html { render action: "admin_edit" }
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 89167fc..62aee23 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -19,7 +19,7 @@
def admin_grant_permissions
@user = User.includes(:perms).find(params[:id])
authorize @user
- user_permss = current_user.perms
+ user_perms = current_user.perms
@perms = user_perms & Perm.where(name: [constant("user_role_types.change_org_details"),constant("user_role_types.use_api"), constant("user_role_types.modify_guidance"), constant("user_role_types.modify_templates"), constant("user_role_types.grant_permissions")])
end
diff --git a/app/views/guidance_groups/admin_show.html.erb b/app/views/guidance_groups/admin_show.html.erb
index a5998ec..9044ecf 100644
--- a/app/views/guidance_groups/admin_show.html.erb
+++ b/app/views/guidance_groups/admin_show.html.erb
@@ -23,36 +23,6 @@
| <%= t('org_admin.org_target_url') %> | -<%= f.text_field :target_url, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", :title t('org_admin.target_url_help_text') %> | +<%= f.text_field :target_url, as: :string, class: 'text_field has-tooltip', data_toggle: "tooltip", title: t('org_admin.target_url_help_text') %> |