shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

Feature #4217: Add append_template action

Browse Source
This commit is contained in:
Daniel Molina 2016-02-11 12:04:47 +01:00
parent 7d19a2f7d6
commit 8aecdc2d0a
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb
View File

@ -62,7 +62,11 @@ module OpenNebulaJSON
end
def update(params=Hash.new)
super(params['template_raw'])
if !params['append'].nil?
super(params['template_raw'], params['append'])
else
super(params['template_raw'])
end
end
def export(params=Hash.new)

4
src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
View File

@ -64,8 +64,8 @@ define(function(require) {
"MarketPlaceApp.chgrp": _commonActions.multipleAction('chgrp'),
"MarketPlaceApp.chmod": _commonActions.singleAction('chmod'),
//"MarketPlaceApp.update" : _commonActions.updateTemplate(),
//"MarketPlaceApp.update_template" : _commonActions.updateTemplate(),
//"MarketPlaceApp.append_template" : _commonActions.appendTemplate(),
"MarketPlaceApp.update_template" : _commonActions.updateTemplate(),
"MarketPlaceApp.append_template" : _commonActions.appendTemplate(),
"MarketPlaceApp.rename": _commonActions.singleAction('rename')
}

2
src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates.js
View File

@ -78,6 +78,8 @@ define(function(require) {
}
function _setup(context) {
var that = this;
context.off("click", ".vmTemplate_edit");
context.on("click", ".vmTemplate_edit", function() {
$("#vmTemplate_text", context).hide();

16
src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs
View File

@ -27,13 +27,15 @@
</thead>
</table>
<textarea rows="6" type="text" id="appTemplate_textarea" class="hidden">{{appTemplate}}</textarea>
<pre id="appTemplate_text" class="info_text">
{{#if appTemplate}}
<pre id="appTemplate_text" class="info_text">
{{~htmlDecode appTemplate~}}
</pre>
{{else}}
{{tr "You can provide a template for the resource that will be created in OpenNebula"}}
<p id="appTemplate_text" class="info_text">
{{~tr "You can provide a template for the resource that will be created in OpenNebula"~}}
</p>
{{/if}}
</pre>
</div>
<div class="large-6 columns">
<table class="dataTable" cellpadding="0" cellspacing="0" border="0">
@ -47,12 +49,14 @@
</thead>
</table>
<textarea rows="6" type="text" id="vmTemplate_textarea" class="hidden">{{vmTemplate}}</textarea>
<pre id="vmTemplate_text" class="info_text">
{{#if vmTemplate}}
<pre id="vmTemplate_text" class="info_text">
{{~htmlDecode vmTemplate~}}
</pre>
{{else}}
{{tr "You can provide a VM template associated to the resource that will be created in OpenNebula"}}
<p id="vmTemplate_text" class="info_text">
{{~tr "You can provide a VM template associated to the resource that will be created in OpenNebula"~}}
</p>
{{/if}}
</pre>
</div>
</div>

2
src/sunstone/public/scss/app.scss
View File

@ -1198,8 +1198,6 @@ hr {
.info_text {
color: #777;
padding: 0px 10px;
overflow-x:hidden;
text-overflow: ellipsis;
}
.vm-action-disabled {