Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hawk/app/assets/javascripts/module/location.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
'<option value=""></option>',
'<option value="Started">Started</option>',
'<option value="Master">Promoted</option>',
'<option value="Slave">Promotable</option>',
'<option value="Slave">Unpromoted</option>',
'</select>',
'</div>',
'</div>',
Expand Down
20 changes: 10 additions & 10 deletions hawk/app/controllers/masters_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def index
end

def new
@title = _("Create Promotable resource")
@title = _("Create Unpromoted resource")
@master = Master.new
@master.meta["target-role"] = "Stopped" if @cib.id == "live"

Expand All @@ -28,7 +28,7 @@ def new

def create
normalize_params! params[:master].permit!
@title = _("Create Promotable resource")
@title = _("Create Unpromoted resource")

@master = Master.new params[:master].permit!

Expand All @@ -37,7 +37,7 @@ def create

respond_to do |format|
format.html do
flash[:success] = _("Promotable resource created successfully")
flash[:success] = _("Unpromoted resource created successfully")
redirect_to edit_cib_master_url(cib_id: @cib.id, id: @master.id)
end
format.json do
Expand All @@ -58,7 +58,7 @@ def create
end

def edit
@title = _("Edit Promotable resource")
@title = _("Edit Unpromoted resource")

respond_to do |format|
format.html
Expand All @@ -67,7 +67,7 @@ def edit

def update
normalize_params! params[:master].permit!
@title = _("Edit Promotable resource")
@title = _("Edit Unpromoted resource")

if params[:revert]
return redirect_to edit_cib_master_url(cib_id: @cib.id, id: @master.id)
Expand All @@ -78,7 +78,7 @@ def update
post_process_for! @master

format.html do
flash[:success] = _("Promotable resource updated successfully")
flash[:success] = _("Unpromoted resource updated successfully")
redirect_to edit_cib_master_url(cib_id: @cib.id, id: @master.id)
end
format.json do
Expand All @@ -100,14 +100,14 @@ def destroy
out, err, rc = Invoker.instance.crm("--force", "configure", "delete", @master.id)
if rc == 0
format.html do
flash[:success] = _("Promotable resource deleted successfully")
flash[:success] = _("Unpromoted resource deleted successfully")
flash[:warning] = err unless err.blank?
redirect_to types_cib_resources_path(cib_id: @cib.id)
end
format.json do
render json: {
success: true,
message: _("Promotable resource deleted successfully")
message: _("Unpromoted resource deleted successfully")
}
end
else
Expand All @@ -134,7 +134,7 @@ def show
protected

def set_title
@title = _("Promotable resource")
@title = _("Unpromoted resource")
end

def set_cib
Expand All @@ -147,7 +147,7 @@ def set_record
unless @master
respond_to do |format|
format.html do
flash[:alert] = _("The Promotable resource (%s) does not exist") % [params[:id]]
flash[:alert] = _("The Unpromoted resource (%s) does not exist") % [params[:id]]
redirect_to types_cib_resources_path(cib_id: @cib.id)
end
end
Expand Down
2 changes: 1 addition & 1 deletion hawk/app/helpers/colocation_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def available_colocation_roles
{
"Started" => _("Started"),
"Master" => _("Promoted"),
"Slave" => _("Promotable"),
"Slave" => _("Unpromoted"),
"Stopped" => _("Stopped")
}
end
Expand Down
2 changes: 1 addition & 1 deletion hawk/app/helpers/ticket_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def available_ticket_roles
{
"Started" => _("Started"),
"Master" => _("Promoted"),
"Slave" => _("Promotable"),
"Slave" => _("Unpromoted"),
"Stopped" => _("Stopped")
}
end
Expand Down
2 changes: 1 addition & 1 deletion hawk/app/views/dashboards/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<li><div class="node-circle status-danger"></div>Failing resource/node</li>
<li><i class="fa fa-wrench" aria-hidden="true"></i>Maintenance mode</li>
<li><div class="node-circle status-offline"></div>Offline/standby mode</li>
<li><i class="fa fa-asterisk" aria-hidden="true"></i>Promotable clone</li>
<li><i class="fa fa-asterisk" aria-hidden="true"></i>Unpromoted clone</li>
<li><div class="node-circle status-default"></div>Not working resource/node</li>
<li><i class="fa fa-home" aria-hidden="true"></i>Designated coordinator</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion hawk/app/views/masters/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-fluid">
<div class="row">
<h1>
<%= icon_text "superscript", _("Promotable Resources"), class: "page" %>
<%= icon_text "superscript", _("Unpromoted Resources"), class: "page" %>
<div class="pull-right">
<div class="btn-group" role="group">
<%= link_to icon_text("plus", _("Create")), new_cib_master_path, class: "btn btn-default" %>
Expand Down
2 changes: 1 addition & 1 deletion hawk/app/views/masters/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-fluid">
<div class="row">
<h1>
<%= icon_text "superscript", _("Create Promotable Resource"), class: "page" %>
<%= icon_text "superscript", _("Create Unpromoted Resource"), class: "page" %>
<div class="pull-right">
<div class="btn-group" role="group"></div>
</div>
Expand Down
Loading