YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #101 from zamentur/twice_app_install

Browse source 
[fix] Can't install several instances of multisite apps (#94)
This commit is contained in:
Le Kload 2015-05-11 09:01:54 +02:00
commit 997bc17eb9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/js/app.js
View file

@ -970,6 +970,7 @@ app = Sammy('#main', function (sam) {
data2 = { 'apps': [], 'installed_apps': false } data2 = { 'apps': [], 'installed_apps': false }
$.each(data['apps'], function(k, v) { $.each(data['apps'], function(k, v) {
if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance == "true") && !v['id'].match(/__[0-9]{1,5}$/)) { if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance == "true") && !v['id'].match(/__[0-9]{1,5}$/)) {
v['install_link']=true;
data2['apps'].push(v); data2['apps'].push(v);
} }
}); });

2
src/views/app/app_list.ms
View file

@ -29,7 +29,7 @@
<div class="list-group"> <div class="list-group">
{{#apps}} {{#apps}}
<a href="#/apps/{{^installed}}install/{{/installed}}{{id}}" class="list-group-item slide"> <a href="#/apps/{{#install_link}}install/{{/install_link}}{{id}}" class="list-group-item slide">
<span class="fa-chevron-right pull-right"></span> <span class="fa-chevron-right pull-right"></span>
<h2 class="list-group-item-heading">{{name}} <small>{{id}}</small></h2> <h2 class="list-group-item-heading">{{name}} <small>{{id}}</small></h2>
<p class="list-group-item-text">{{description}}</p> <p class="list-group-item-text">{{description}}</p>