diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-14 19:11:01 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-14 19:11:01 -0800 |
| commit | bae28965abb179948ccd50eabdc2c038a58b9b03 (patch) | |
| tree | dfb9503bec536f0a8a03a92bbc4cd883e278e864 /Zotlabs/Module | |
| parent | 63efbdffe6ef653e1556a7b34ea59b75b234e759 (diff) | |
| download | volse-hubzilla-bae28965abb179948ccd50eabdc2c038a58b9b03.tar.gz volse-hubzilla-bae28965abb179948ccd50eabdc2c038a58b9b03.tar.bz2 volse-hubzilla-bae28965abb179948ccd50eabdc2c038a58b9b03.zip | |
issue #446 apps usability - disable app if attached to a plugin that is uninstalled, allow system apps to be soft deleted and undeleted from the edit pane.
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Appman.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Apps.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Appman.php b/Zotlabs/Module/Appman.php index a200e986a..425b2d539 100644 --- a/Zotlabs/Module/Appman.php +++ b/Zotlabs/Module/Appman.php @@ -56,6 +56,7 @@ class Appman extends \Zotlabs\Web\Controller { if($_POST['delete']) { Zlib\Apps::app_destroy(local_channel(),$papp); } + if($_POST['edit']) { return; diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 4dab621b2..5583f1757 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -21,7 +21,7 @@ class Apps extends \Zotlabs\Web\Controller { if(local_channel()) { Zlib\Apps::import_system_apps(); $syslist = array(); - $list = Zlib\Apps::app_list(local_channel(), false, $_GET['cat']); + $list = Zlib\Apps::app_list(local_channel(), (($mode == 'edit') ? true : false), $_GET['cat']); if($list) { foreach($list as $x) { $syslist[] = Zlib\Apps::app_encode($x); |