From 44705b7f47ca661fcb737648aa5c00092caccf16 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Wed, 18 Feb 2015 11:29:28 +0100
Subject: [PATCH] Fix #872: webadmin checkboxes

Don't claim all networks/users have loaded a module when there are none
---
 modules/data/webadmin/tmpl/add_edit_user.tmpl | 2 +-
 modules/data/webadmin/tmpl/settings.tmpl      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index f0f610fb..2f4ff370 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -206,7 +206,7 @@
 						<td align="center">
 							<? IF CanBeLoadedByNetwork ?>
 								<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
-								<? IF LoadedByAllNetworks ?>
+								<? IF LoadedBySomeNetworks && LoadedByAllNetworks ?>
 									checked="checked"
 								<? ENDIF ?>
 								disabled="disabled"/>
diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl
index ef3f8eb2..934512ca 100644
--- a/modules/data/webadmin/tmpl/settings.tmpl
+++ b/modules/data/webadmin/tmpl/settings.tmpl
@@ -198,7 +198,7 @@
 						<td align="center">
 							<? IF CanBeLoadedByNetwork ?>
 								<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
-								<? IF LoadedByAllNetworks ?>
+								<? IF LoadedBySomeNetworks && LoadedByAllNetworks ?>
 									checked="checked"
 								<? ENDIF ?>
 								disabled="disabled"/>
@@ -212,7 +212,7 @@
 						<td align="center">
 							<? IF CanBeLoadedByUser ?>
 								<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>"
-								<? IF LoadedByAllUsers ?>
+								<? IF LoadedBySomeUsers && LoadedByAllUsers ?>
 									checked="checked"
 								<? ENDIF ?>
 								disabled="disabled"/>