Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
9763d33a
Commit
9763d33a
authored
Apr 11, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Fixes for navigation when request/revoke tokens and certificates
parent
10c4ac32
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
94 additions
and
31 deletions
+94
-31
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_get_token_js.js
...module/rjs_gadget_erp5_page_slap_computer_get_token_js.js
+7
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_get_token_js.xml
...odule/rjs_gadget_erp5_page_slap_computer_get_token_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_request_certificate_js.js
..._gadget_erp5_page_slap_computer_request_certificate_js.js
+8
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_request_certificate_js.xml
...gadget_erp5_page_slap_computer_request_certificate_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_revoke_certificate_js.js
...s_gadget_erp5_page_slap_computer_revoke_certificate_js.js
+8
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_revoke_certificate_js.xml
..._gadget_erp5_page_slap_computer_revoke_certificate_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_get_token_js.js
...e_module/rjs_gadget_erp5_page_slap_person_get_token_js.js
+7
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_get_token_js.xml
..._module/rjs_gadget_erp5_page_slap_person_get_token_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_request_certificate_js.js
...js_gadget_erp5_page_slap_person_request_certificate_js.js
+8
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_request_certificate_js.xml
...s_gadget_erp5_page_slap_person_request_certificate_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_revoke_certificate_js.js
...rjs_gadget_erp5_page_slap_person_revoke_certificate_js.js
+11
-4
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_revoke_certificate_js.xml
...js_gadget_erp5_page_slap_person_revoke_certificate_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
...b_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
+30
-4
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
..._page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
+3
-3
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_get_token_js.js
View file @
9763d33a
...
@@ -108,9 +108,15 @@
...
@@ -108,9 +108,15 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
slap_computer_list
"
}})
]);
})
.
push
(
function
(
url_list
)
{
var
header_dict
=
{
var
header_dict
=
{
page_title
:
"
Request New Token
"
,
page_title
:
"
Request New Token
"
,
submit_action
:
true
submit_action
:
true
,
selection_url
:
url_list
[
0
]
};
};
return
gadget
.
updateHeader
(
header_dict
);
return
gadget
.
updateHeader
(
header_dict
);
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_get_token_js.xml
View file @
9763d33a
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.1
1783.35902.34747
</string>
</value>
<value>
<string>
963.1
3252.46039.12646
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
09614011.63
</float>
<float>
15
23376496.21
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_request_certificate_js.js
View file @
9763d33a
...
@@ -121,10 +121,16 @@
...
@@ -121,10 +121,16 @@
}
}
});
});
})
})
.
push
(
function
()
{
.
push
(
function
(
result
)
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
history_previous
'
})
]);
})
.
push
(
function
(
url_list
)
{
var
header_dict
=
{
var
header_dict
=
{
page_title
:
"
Request New Certificate
"
,
page_title
:
"
Request New Certificate
"
,
submit_action
:
true
submit_action
:
true
,
selection_url
:
url_list
[
0
]
};
};
return
gadget
.
updateHeader
(
header_dict
);
return
gadget
.
updateHeader
(
header_dict
);
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_request_certificate_js.xml
View file @
9763d33a
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.9
183.27618.62976
</string>
</value>
<value>
<string>
963.9
426.27532.17049
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
09467572.68
</float>
<float>
15
23382684.29
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_revoke_certificate_js.js
View file @
9763d33a
...
@@ -98,10 +98,16 @@
...
@@ -98,10 +98,16 @@
}
}
});
});
})
})
.
push
(
function
()
{
.
push
(
function
(
result
)
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
history_previous
'
})
]);
})
.
push
(
function
(
url_list
)
{
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
page_title
:
"
Revoke Computer Certificate
"
,
page_title
:
"
Revoke Computer Certificate
"
,
submit_action
:
true
submit_action
:
true
,
selection_url
:
url_list
[
0
]
});
});
});
});
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_revoke_certificate_js.xml
View file @
9763d33a
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.9
179.31358.47206
</string>
</value>
<value>
<string>
963.9
426.27532.17049
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
09457711.73
</float>
<float>
15
23382738.86
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_get_token_js.js
View file @
9763d33a
...
@@ -111,9 +111,15 @@
...
@@ -111,9 +111,15 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
slap_person_view
"
}})
]);
})
.
push
(
function
(
url_list
)
{
var
header_dict
=
{
var
header_dict
=
{
page_title
:
"
Request New Token
"
,
page_title
:
"
Request New Token
"
,
submit_action
:
true
submit_action
:
true
,
selection_url
:
url_list
[
0
]
};
};
return
gadget
.
updateHeader
(
header_dict
);
return
gadget
.
updateHeader
(
header_dict
);
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_get_token_js.xml
View file @
9763d33a
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.1
1778.2343.53282
</string>
</value>
<value>
<string>
963.1
3252.46039.12646
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
09613804.28
</float>
<float>
15
23440041.74
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_request_certificate_js.js
View file @
9763d33a
...
@@ -121,10 +121,16 @@
...
@@ -121,10 +121,16 @@
}
}
});
});
})
})
.
push
(
function
()
{
.
push
(
function
(
result
)
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
'
slap_person_view
'
}})
]);
})
.
push
(
function
(
url_list
)
{
var
header_dict
=
{
var
header_dict
=
{
page_title
:
"
Request New Certificate
"
,
page_title
:
"
Request New Certificate
"
,
submit_action
:
true
submit_action
:
true
,
selection_url
:
url_list
[
0
]
};
};
return
gadget
.
updateHeader
(
header_dict
);
return
gadget
.
updateHeader
(
header_dict
);
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_request_certificate_js.xml
View file @
9763d33a
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.9343.28182.38178
</string>
</value>
<value>
<string>
96
6.51407.11575.14882
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
09467517.63
</float>
<float>
15
23442542.74
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_revoke_certificate_js.js
View file @
9763d33a
...
@@ -98,11 +98,18 @@
...
@@ -98,11 +98,18 @@
}
}
});
});
})
})
.
push
(
function
()
{
.
push
(
function
(
result
)
{
return
gadget
.
updateHeader
({
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
'
slap_person_view
'
}})
]);
})
.
push
(
function
(
url_list
)
{
var
header_dict
=
{
page_title
:
"
Revoke Person Certificate
"
,
page_title
:
"
Revoke Person Certificate
"
,
submit_action
:
true
submit_action
:
true
,
});
selection_url
:
url_list
[
0
]
};
return
gadget
.
updateHeader
(
header_dict
);
});
});
});
});
}(
window
,
rJS
,
RSVP
));
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_revoke_certificate_js.xml
View file @
9763d33a
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.8908.56192.28808
</string>
</value>
<value>
<string>
96
6.51407.14598.40925
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
09442196.32
</float>
<float>
15
23442545.33
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
View file @
9763d33a
...
@@ -15,12 +15,30 @@
...
@@ -15,12 +15,30 @@
.
declareAcquiredMethod
(
"
updateDocument
"
,
"
updateDocument
"
)
.
declareAcquiredMethod
(
"
updateDocument
"
,
"
updateDocument
"
)
.
declareAcquiredMethod
(
"
jio_getAttachment
"
,
"
jio_getAttachment
"
)
.
declareAcquiredMethod
(
"
jio_getAttachment
"
,
"
jio_getAttachment
"
)
.
declareAcquiredMethod
(
"
jio_putAttachment
"
,
"
jio_putAttachment
"
)
.
declareAcquiredMethod
(
"
jio_putAttachment
"
,
"
jio_putAttachment
"
)
.
declareAcquiredMethod
(
"
jio_put
"
,
"
jio_put
"
)
.
declareAcquiredMethod
(
"
notifySubmitting
"
,
"
notifySubmitting
"
)
.
declareAcquiredMethod
(
"
notifySubmitting
"
,
"
notifySubmitting
"
)
.
declareAcquiredMethod
(
"
notifySubmitted
"
,
'
notifySubmitted
'
)
.
declareAcquiredMethod
(
"
notifySubmitted
"
,
'
notifySubmitted
'
)
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
// declared methods
// declared methods
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
.
declareMethod
(
'
updateDocument
'
,
function
(
content
)
{
var
gadget
=
this
,
property
,
doc
=
{};
for
(
property
in
content
)
{
if
((
content
.
hasOwnProperty
(
property
))
&&
// Remove undefined keys added by Gadget fields
(
property
!==
"
undefined
"
)
&&
// Remove listboxes UIs
(
property
!==
"
listbox_uid:list
"
)
&&
// Remove default_*:int keys added by ListField
!
(
property
.
endsWith
(
"
:int
"
)
&&
property
.
startsWith
(
"
default_
"
)))
{
doc
[
property
]
=
content
[
property
];
}
}
return
gadget
.
jio_put
(
gadget
.
state
.
jio_key
,
doc
);
})
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
,
var
gadget
=
this
,
jio_key
;
jio_key
;
...
@@ -53,7 +71,12 @@
...
@@ -53,7 +71,12 @@
return
form_gadget
.
getContent
();
return
form_gadget
.
getContent
();
})
})
.
push
(
function
(
content
)
{
.
push
(
function
(
content
)
{
return
gadget
.
updateDocument
(
content
);
return
gadget
.
updateDocument
(
content
)
.
push
(
function
()
{
return
gadget
.
updateHeader
({
page_title
:
"
Your Account :
"
+
content
.
first_name
+
"
"
+
content
.
last_name
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
notifySubmitted
({
message
:
'
Data Updated
'
,
status
:
'
success
'
});
return
gadget
.
notifySubmitted
({
message
:
'
Data Updated
'
,
status
:
'
success
'
});
...
@@ -125,11 +148,14 @@
...
@@ -125,11 +148,14 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
getSetting
(
"
me
"
);
})
.
push
(
function
(
me
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
editable
:
true
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
editable
:
true
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slap_person_revoke_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_revoke_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slap_person_request_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_request_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slap_person_get_token
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_get_token
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slapos
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slapos
"
}})
]);
]);
})
})
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
View file @
9763d33a
...
@@ -227,7 +227,7 @@
...
@@ -227,7 +227,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
ERP5TypeTestCas
e
</string>
</value>
<value>
<string>
zop
e
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -241,7 +241,7 @@
...
@@ -241,7 +241,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
966.
43122.58529.31436
</string>
</value>
<value>
<string>
966.
51361.49328.12834
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -259,7 +259,7 @@
...
@@ -259,7 +259,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
152
2945214.2
</float>
<float>
152
3440982.76
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment