Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
790c57fc
Commit
790c57fc
authored
Dec 11, 2020
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_forge: push directly from the vcs gadget
parent
ea28b16c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsStatusDialog/your_commit_json.xml
...BusinessTemplate_viewVcsStatusDialog/your_commit_json.xml
+1
-1
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/gadget_vcs_status.html.html
...ateItem/portal_skins/erp5_vcs/gadget_vcs_status.html.html
+1
-0
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/gadget_vcs_status.js.js
...emplateItem/portal_skins/erp5_vcs/gadget_vcs_status.js.js
+9
-1
No files found.
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsStatusDialog/your_commit_json.xml
View file @
790c57fc
...
...
@@ -135,7 +135,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: [(\'default_changelog\', "{}: ".format(context.getTitle())), (\'diff_url\', \'%s/BusinessTemplate_doVcsDiffAsJson\' % here.absolute_url()), (\'get_tree_url\', \'%s/tree.xml\' % here.absolute_url()), (\'remote_url\', here.getVcsTool().getRemoteUrl()), (\'remote_comment\', here.getVcsTool().getRemoteComment())]
</string>
</value>
<value>
<string>
python: [(\'default_
push\', preferences.getPreferredVcsPushMode() and not here.getVcsTool().getAheadCount()), (\'default_
changelog\', "{}: ".format(context.getTitle())), (\'diff_url\', \'%s/BusinessTemplate_doVcsDiffAsJson\' % here.absolute_url()), (\'get_tree_url\', \'%s/tree.xml\' % here.absolute_url()), (\'remote_url\', here.getVcsTool().getRemoteUrl()), (\'remote_comment\', here.getVcsTool().getRemoteComment())]
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/gadget_vcs_status.html.html
View file @
790c57fc
...
...
@@ -9,6 +9,7 @@
data-i18n=Diff
data-i18n=Changelog
data-i18n=Expand
data-i18n=Push
-->
<meta
http-equiv=
"Content-type"
content=
"text/html; charset=utf-8"
/>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=no"
/>
...
...
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/gadget_vcs_status.js.js
View file @
790c57fc
...
...
@@ -27,7 +27,7 @@
function
getTranslationDict
(
gadget
)
{
var
word_list
=
[
'
Added Files
'
,
'
Modified Files
'
,
'
Removed Files
'
,
'
Tree
'
,
'
Diff
'
,
'
Changelog
'
,
'
Expand
'
];
'
Tree
'
,
'
Diff
'
,
'
Changelog
'
,
'
Expand
'
,
'
Push
'
];
return
gadget
.
getTranslationList
(
word_list
)
.
push
(
function
(
result_list
)
{
var
result
=
{},
...
...
@@ -492,6 +492,13 @@
.
push
(
function
(
translation_dict
)
{
renderGadgetHeader
(
gadget
,
false
,
translation_dict
);
domsugar
(
gadget
.
element
.
querySelector
(
'
div.vcsbody
'
),
[
domsugar
(
'
label
'
,
{
text
:
translation_dict
.
Push
},
[
'
'
,
domsugar
(
'
input
'
,
{
type
:
'
checkbox
'
,
checked
:
result
.
push
||
gadget
.
state
.
default_push
||
false
})
]),
domsugar
(
'
h3
'
,
{
text
:
translation_dict
.
Changelog
}),
domsugar
(
'
textarea
'
,
{
value
:
result
.
changelog
||
gadget
.
state
.
default_changelog
||
''
...
...
@@ -509,6 +516,7 @@
function
getContentFromChangelogView
(
gadget
)
{
var
result
=
JSON
.
parse
(
gadget
.
state
.
value
);
result
.
changelog
=
gadget
.
element
.
querySelector
(
'
textarea
'
).
value
;
result
.
push
=
gadget
.
element
.
querySelector
(
'
input
'
).
checked
;
gadget
.
state
.
value
=
JSON
.
stringify
(
result
);
}
...
...
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