adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 08:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show empty checkbox if module can be loaded by the topic column.

Browse Source 
Fix const correctnes of the CModInfo::SupportsType method.
This commit is contained in:
Vasily Fomin
2014-06-01 21:37:39 +02:00
parent 16b268deef
commit 4338ae5cc5
5 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Modules.h
+1 -1
View File
@@ -203,7 +203,7 @@ public:
return (GetName() < Info.GetName());
}
bool SupportsType(EModuleType eType) {
bool SupportsType(EModuleType eType) const {
return m_seType.find(eType) != m_seType.end();
}
modules/data/webadmin/tmpl/add_edit_network.tmpl
+12 -4
View File
@@ -184,13 +184,21 @@
</td>
<td class="mod_descr"><? VAR Description ?></td>
<td align="center">
<? IF LoadedGlobally ?>
<input type="checkbox" name="loaded_globally" id="loaded_globally_<? VAR Name ?>" checked="checked" disabled="disabled"/>
<? IF CanBeLoadedGlobally ?>
<input type="checkbox" name="loaded_globally" id="loaded_globally_<? VAR Name ?>"
<? IF LoadedGlobally ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
<? ENDIF ?>
</td>
<td align="center">
<? IF LoadedByUser ?>
<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>" checked="checked" disabled="disabled"/>
<? IF CanBeLoadedByUser ?>
<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>"
<? IF LoadedByUser ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
<? ENDIF ?>
</td>
</tr>
modules/data/webadmin/tmpl/add_edit_user.tmpl
+14 -6
View File
@@ -194,14 +194,22 @@
</td>
<td class="mod_descr"><? VAR Description ?></td>
<td align="center">
<? IF LoadedGlobally ?>
<input type="checkbox" name="loaded_globally" id="loaded_globally_<? VAR Name ?>" checked="checked" disabled="disabled"/>
<? ENDIF ?>
<? IF CanBeLoadedGlobally ?>
<input type="checkbox" name="loaded_globally" id="loaded_globally_<? VAR Name ?>"
<? IF LoadedGlobally ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
<? ENDIF ?>
</td>
<td align="center">
<? IF LoadedBySomeNetworks ?>
<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>" checked="checked" disabled="disabled"/>
<? IF !LoadedByAllNetworks ?>
<? IF CanBeLoadedByNetwork ?>
<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
<? IF LoadedByAllNetworks ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
<? IF LoadedBySomeNetworks && !LoadedByAllNetworks ?>
<script type="text/javascript">
document.getElementById("loaded_by_net_<? VAR Name ?>").indeterminate = true;
</script>
modules/data/webadmin/tmpl/settings.tmpl
+14 -6
View File
@@ -189,9 +189,13 @@
</td>
<td class="mod_descr"><? VAR Description ?></td>
<td align="center">
<? IF LoadedBySomeNetworks ?>
<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>" checked="checked" disabled="disabled"/>
<? IF !LoadedByAllNetworks ?>
<? IF CanBeLoadedByNetwork ?>
<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
<? IF LoadedByAllNetworks ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
<? IF LoadedBySomeNetworks && !LoadedByAllNetworks ?>
<script type="text/javascript">
document.getElementById("loaded_by_net_<? VAR Name ?>").indeterminate = true;
</script>
@@ -199,9 +203,13 @@
<? ENDIF ?>
</td>
<td align="center">
<? IF LoadedBySomeUsers ?>
<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>" checked="checked" disabled="disabled"/>
<? IF !LoadedByAllUsers ?>
<? IF CanBeLoadedByUser ?>
<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>"
<? IF LoadedByAllUsers ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
<? IF LoadedBySomeUsers && !LoadedByAllUsers ?>
<script type="text/javascript">
document.getElementById("loaded_by_user_<? VAR Name ?>").indeterminate = true;
</script>
modules/webadmin.cpp
+9 -3
View File
@@ -753,9 +753,11 @@ public:
}
// Check if module is loaded globally
l["CanBeLoadedGlobally"] = CString(Info.SupportsType(CModInfo::GlobalModule));
l["LoadedGlobally"] = CString(CZNC::Get().GetModules().FindModule(Info.GetName()) != NULL);
// Check if module is loaded by user
l["CanBeLoadedByUser"] = CString(Info.SupportsType(CModInfo::UserModule));
l["LoadedByUser"] = CString(pUser->GetModules().FindModule(Info.GetName()) != NULL);
if (!spSession->IsAdmin() && pUser->DenyLoadMod()) {
@@ -1227,6 +1229,7 @@ public:
networksWithRenderedModuleCount++;
}
}
l["CanBeLoadedByNetwork"] = CString(Info.SupportsType(CModInfo::NetworkModule));
l["LoadedByAllNetworks"] = CString(networksWithRenderedModuleCount == userNetworks.size());
l["LoadedBySomeNetworks"] = CString(networksWithRenderedModuleCount != 0);
}
@@ -1237,7 +1240,7 @@ public:
l["Disabled"] = "true";
}
}
l["CanBeLoadedGlobally"] = CString(Info.SupportsType(CModInfo::GlobalModule));
// Check if module is loaded globally
l["LoadedGlobally"] = CString(CZNC::Get().GetModules().FindModule(Info.GetName()) != NULL);
@@ -1673,10 +1676,13 @@ public:
}
}
}
l["LoadedByAllUsers"] = CString(usersWithRenderedModuleCount == allUsers.size());
l["LoadedBySomeUsers"] = CString(usersWithRenderedModuleCount != 0);
l["CanBeLoadedByNetwork"] = CString(Info.SupportsType(CModInfo::NetworkModule));
l["LoadedByAllNetworks"] = CString(networksWithRenderedModuleCount == networksCount);
l["LoadedBySomeNetworks"] = CString(networksWithRenderedModuleCount != 0);
l["CanBeLoadedByUser"] = CString(Info.SupportsType(CModInfo::UserModule));
l["LoadedByAllUsers"] = CString(usersWithRenderedModuleCount == allUsers.size());
l["LoadedBySomeUsers"] = CString(usersWithRenderedModuleCount != 0);
}
return true;