Skip to content

Commit 30db930

Browse files
committed
Removed ownership_form_controller code.
1 parent 8a2b939 commit 30db930

File tree

3 files changed

+25
-220
lines changed

3 files changed

+25
-220
lines changed

app/assets/javascripts/controllers/ownership/ownership_form_controller.js

Lines changed: 0 additions & 77 deletions
This file was deleted.
Lines changed: 25 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,33 @@
1-
- @angular_form = true
1+
- if @ownershipitems.length > 1
2+
- user_opts = [["<#{_("Don't change")}>", 'dont-change'], ["<#{_('No Owner')}>"]]
3+
- else
4+
- user_opts = [["<#{_('No Owner')}>", '']]
5+
- user_opts += ownership_user_options.sort
26

3-
%form#form_div.form-horizontal{"name" => "angularForm",
4-
"ng-controller" => "ownershipFormController as vm",
5-
"ng-show" => "vm.afterGet",
6-
"miq-form" => true,
7-
"model" => "vm.ownershipModel",
8-
"model-copy" => "vm.modelCopy"}
9-
= render :partial => "layouts/flash_msg"
10-
%h3
11-
= _('Changes')
12-
.form-horizontal
13-
.form-group{"ng-class" => "{'has-error': angularForm.user.$invalid}"}
14-
%label.col-md-2.control-label
15-
= _('Select an Owner:')
16-
.col-md-8
17-
- if @ownershipitems.length > 1
18-
- opts = [["<#{_("Don't change")}>", 'dont-change'], ["<#{_('No Owner')}>", '']]
19-
- else
20-
- opts = [["<#{_('No Owner')}>", '']]
21-
- opts += ownership_user_options.sort
22-
= select_tag("user",
23-
options_for_select(opts, @user),
24-
"ng-model" => "vm.ownershipModel.user",
25-
"id" => "user_name",
26-
"checkchange" => "",
27-
"data-container" => "body",
28-
"selectpicker-for-select-tag" => "")
29-
%td{:width => "100"}
30-
.form-group{"ng-class" => "{'has-error': angularForm.group.$invalid}"}
31-
%label.col-md-2.control-label
32-
= _('Select a Group:')
33-
.col-md-8
34-
- if @ownershipitems.length > 1
35-
- opts = [["<#{_("Don't change")}>", 'dont-change'], ["<#{_('No User Group')}>", '']]
36-
- user_group = ''
37-
- else
38-
- user_group = MiqGroup.find_by(:id => @group).tenant_group? ? @group : ''
39-
- opts = [["<#{_('No User Group')}>", user_group]]
40-
- opts += @groups.sort
41-
= select_tag("group",
42-
options_for_select(opts, user_group),
43-
"ng-model" => "vm.ownershipModel.group",
44-
"id" => "group_name",
45-
"checkchange" => "",
46-
"data-container" => "body",
47-
"selectpicker-for-select-tag" => "")
7+
- if @ownershipitems.length > 1
8+
- groups_opts = [["<#{_("Don't change")}>", 'dont-change'], ["<#{_('No User Group')}>", '']]
9+
- user_group = ''
10+
- else
11+
- user_group = MiqGroup.find_by(:id => @group).tenant_group? ? @group : ''
12+
- groups_opts = [["<#{_('No User Group')}>", user_group]]
13+
- groups_opts += @groups.sort
4814

49-
%hr
50-
%h3
51-
= _('Affected Items')
52-
- if @origin_ownership_items.count != @ownershipitems.count
53-
%strong
54-
= _('Note: Some items might be hidden due to the possibility of an ownership change')
15+
= render :partial => "layouts/flash_msg"
5516

56-
%div_for_paging{'ng-controller' => "pagingDivButtonGroupController",
57-
'paging_div_buttons_state_enabled' => true,
58-
'paging_div_buttons_id' => "angular_paging_div_buttons",
59-
'paging_div_buttons_type' => "Save"}
60-
- unless @explorer
61-
= render :partial => "layouts/angular/x_edit_buttons_angular"
17+
%h3
18+
= _('Changes')
19+
20+
= react('SetServiceOwnershipForm', { :ownerOptions => user_opts, :groupOptions => groups_opts, :ownershipIds => @ownershipitems.collect(&:id).map(&:to_s) })
21+
22+
%hr
23+
%h3
24+
= _('Affected Items')
25+
- if @origin_ownership_items.count != @ownershipitems.count
26+
%strong
27+
= _('Note: Some items might be hidden due to the possibility of an ownership change')
6228

6329
- if @ownershipitems
6430
- @embedded = true
6531
- @quadicon_no_url = true
6632
- @gtl_type = settings(:views, :tagging)
67-
= render :partial => "layouts/gtl"
68-
:javascript
69-
ManageIQ.angular.app.value('ownershipFormId', '#{"ownership"}');
70-
ManageIQ.angular.app.value('objectIds', #{ @ownershipitems.collect(&:id) });
71-
miq_bootstrap('#form_div');
33+
= render :partial => "layouts/gtl", :locals => {:no_flash_div => true}

spec/javascripts/controllers/ownership/ownership_form_controller_spec.js

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)