Attachment 909565 Details for Bug 1092615 – added missing commit

[patch] added missing commit

ffaacb59d382c42eb6c0338382c12d7a18956508.patch (text/plain), 4.75 KB, created by Ohad Levy on 2014-06-17 12:20:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ohad Levy

Created: 2014-06-17 12:20:59 UTC

Size: 4.75 KB

patch

obsolete

>From ffaacb59d382c42eb6c0338382c12d7a18956508 Mon Sep 17 00:00:00 2001
>From: Amos Benari <abenari@redhat.com>
>Date: Thu, 15 May 2014 09:19:11 +0300
>Subject: [PATCH] renamed Red Hat Directory Server to Red Hat Identity
> Management
>
>---
> app/controllers/api/v2/realms_controller.rb       | 2 +-
> app/models/realm.rb                               | 2 +-
> app/views/realms/_form.html.erb                   | 2 +-
> app/views/unattended/kickstart/finish.erb         | 2 +-
> app/views/unattended/kickstart/provision.erb      | 2 +-
> app/views/unattended/kickstart/provision_rhel.erb | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/app/controllers/api/v2/realms_controller.rb b/app/controllers/api/v2/realms_controller.rb
>index 2113f9e..2699d4b 100644
>--- a/app/controllers/api/v2/realms_controller.rb
>+++ b/app/controllers/api/v2/realms_controller.rb
>@@ -29,7 +29,7 @@ module Api
>         param :realm, Hash, :action_aware => true do
>           param :name, String, :required => true, :desc => "The realm name, e.g. EXAMPLE.COM"
>           param :realm_proxy_id, :number, :required => false, :allow_nil => true, :desc => "Proxy to use for this realm"
>-          param :realm_type, String, :required => true, :desc => "Realm type, e.g. Red Hat Directory Server or Active Directory"
>+          param :realm_type, String, :required => true, :desc => "Realm type, e.g. Red Hat Identity Management or Active Directory"
>         end
>       end
> 
>diff --git a/app/models/realm.rb b/app/models/realm.rb
>index 430bbfb..13b7ced 100644
>--- a/app/models/realm.rb
>+++ b/app/models/realm.rb
>@@ -2,7 +2,7 @@ class Realm < ActiveRecord::Base
>   include Authorizable
>   include Taxonomix
> 
>-  TYPES = ["Red Hat Directory Server", "Active Directory"]
>+  TYPES = ["Red Hat Identity Management", "Active Directory"]
> 
>   audited :allow_mass_assignment => true
>   before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
>diff --git a/app/views/realms/_form.html.erb b/app/views/realms/_form.html.erb
>index aa06793..50a9e16 100644
>--- a/app/views/realms/_form.html.erb
>+++ b/app/views/realms/_form.html.erb
>@@ -15,7 +15,7 @@
>     <div class="tab-pane active" id="primary">
>       <%= text_f   f, :name, :help_inline => _("Realm name, e.g. EXAMPLE.COM") %>
>       <%= select_f f, :realm_type, Realm::TYPES, :to_s, :to_s, { },
>-          {:label => _("Realm type"), :help_inline => _("Type of realm, e.g. Red Hat Directory Server")}
>+          {:label => _("Realm type"), :help_inline => _("Type of realm, e.g. Red Hat Identity Management")}
>       %>
>        <%= select_f f, :realm_proxy_id, SmartProxy.with_features("Realm"), :id, :name,
>            { }, {:label => _("Realm proxy"), :help_inline => _("Realm proxy to use within this realm")}
>diff --git a/app/views/unattended/kickstart/finish.erb b/app/views/unattended/kickstart/finish.erb
>index c13eb4a..3c405ea 100644
>--- a/app/views/unattended/kickstart/finish.erb
>+++ b/app/views/unattended/kickstart/finish.erb
>@@ -39,7 +39,7 @@ echo "updating system time"
> /usr/sbin/ntpdate -sub <%= @host.params['ntp-server'] || '0.fedora.pool.ntp.org' %>
> /usr/sbin/hwclock --systohc
> 
>-<% if @host.respond_to?(:otp) && @host.otp && @host.realm && @host.realm.realm_type == "Red Hat Directory Server" -%>
>+<% if @host.respond_to?(:otp) && @host.otp && @host.realm && @host.realm.realm_type == "Red Hat Identity Management" -%>
> <%= snippet "freeipa_register" %>
> <% end -%>
> 
>diff --git a/app/views/unattended/kickstart/provision.erb b/app/views/unattended/kickstart/provision.erb
>index 4d6a1cb..a309b96 100644
>--- a/app/views/unattended/kickstart/provision.erb
>+++ b/app/views/unattended/kickstart/provision.erb
>@@ -113,7 +113,7 @@ echo "updating system time"
> /usr/sbin/ntpdate -sub <%= @host.params['ntp-server'] || '0.fedora.pool.ntp.org' %>
> /usr/sbin/hwclock --systohc
> 
>-<% if realm_incompatible && @host.info["parameters"]["realm"] && @host.otp && @host.realm && @host.realm.realm_type == "Red Hat Directory Server" -%>
>+<% if realm_incompatible && @host.info["parameters"]["realm"] && @host.otp && @host.realm && @host.realm.realm_type == "Red Hat Identity Management" -%>
> <%= snippet "freeipa_register" %>
> <% end -%>
> 
>diff --git a/app/views/unattended/kickstart/provision_rhel.erb b/app/views/unattended/kickstart/provision_rhel.erb
>index 08f4ce8..8321341 100644
>--- a/app/views/unattended/kickstart/provision_rhel.erb
>+++ b/app/views/unattended/kickstart/provision_rhel.erb
>@@ -98,7 +98,7 @@ echo "updating system time"
> 
> <%= snippet 'redhat_register' %>
> 
>-<% if @host.info["parameters"]["realm"] && @host.otp && @host.realm && @host.realm.realm_type == "Red Hat Directory Server" && os_major <= 6 -%>
>+<% if @host.info["parameters"]["realm"] && @host.otp && @host.realm && @host.realm.realm_type == "Red Hat Identity Management" && os_major <= 6 -%>
> <%= snippet "freeipa_register" %>
> <% end -%>
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1092615: 909565