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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
07fa136d
Commit
07fa136d
authored
Dec 11, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_forge: activate changelog in the vcs gadget
parent
213d6299
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
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.js.js
...emplateItem/portal_skins/erp5_vcs/gadget_vcs_status.js.js
+10
-8
No files found.
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsStatusDialog/your_commit_json.xml
View file @
07fa136d
...
...
@@ -135,7 +135,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: [(\'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: [(\'d
efault_changelog\', "{}: ".format(context.getTitle())), (\'d
iff_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.js.js
View file @
07fa136d
...
...
@@ -193,18 +193,16 @@
])
],
tree_icon
=
'
ui-icon-check-square
'
,
diff_icon
=
'
ui-icon-search-plus
'
;
//
changelog_icon = 'ui-icon-git';
diff_icon
=
'
ui-icon-search-plus
'
,
changelog_icon
=
'
ui-icon-git
'
;
if
(
loading
)
{
if
(
gadget
.
state
.
display_step
===
DISPLAY_TREE
)
{
tree_icon
=
'
ui-icon-spinner
'
;
}
else
if
(
gadget
.
state
.
display_step
===
DISPLAY_DIFF
)
{
diff_icon
=
'
ui-icon-spinner
'
;
/*
}
else
if
(
gadget
.
state
.
display_step
===
DISPLAY_CHANGELOG
)
{
changelog_icon
=
'
ui-icon-spinner
'
;
*/
}
else
{
throw
new
Error
(
"
Can't render header state
"
+
gadget
.
state
.
display_step
);
...
...
@@ -223,14 +221,12 @@
text
:
translation_dict
.
Diff
,
disabled
:
(
gadget
.
state
.
display_step
===
DISPLAY_DIFF
),
class
:
'
diff-tree-btn ui-btn-icon-left
'
+
diff_icon
/*
}),
domsugar
(
'
button
'
,
{
type
:
'
button
'
,
text
:
translation_dict
.
Changelog
,
disabled
:
(
gadget
.
state
.
display_step
===
DISPLAY_CHANGELOG
),
class
:
'
changelog-btn ui-btn-icon-left
'
+
changelog_icon
*/
})
);
...
...
@@ -496,7 +492,10 @@
.
push
(
function
(
translation_dict
)
{
renderGadgetHeader
(
gadget
,
false
,
translation_dict
);
domsugar
(
gadget
.
element
.
querySelector
(
'
div.vcsbody
'
),
[
domsugar
(
'
textarea
'
,
{
value
:
result
.
changelog
}),
domsugar
(
'
h3
'
,
{
text
:
translation_dict
.
Changelog
}),
domsugar
(
'
textarea
'
,
{
value
:
result
.
changelog
||
gadget
.
state
.
default_changelog
||
''
}),
domsugar
(
'
h3
'
,
{
text
:
translation_dict
[
'
Added Files
'
]}),
domsugar
(
'
pre
'
,
{
text
:
result
.
added
.
join
(
'
\n
'
)}),
domsugar
(
'
h3
'
,
{
text
:
translation_dict
[
'
Modified Files
'
]}),
...
...
@@ -526,11 +525,14 @@
remote_comment
:
options
.
remote_comment
,
remote_url
:
options
.
remote_url
,
key
:
options
.
key
,
default_changelog
:
options
.
default_changelog
,
default_push
:
options
.
default_push
,
value
:
options
.
value
||
JSON
.
stringify
({
added
:
[],
modified
:
[],
removed
:
[],
changelog
:
''
changelog
:
''
,
push
:
false
}),
editable
:
(
options
.
editable
===
undefined
)
?
true
:
options
.
editable
});
...
...
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