Changeset 9881d7 in indico for indico/MaKaC/webinterface/pages/conferences.py

Timestamp:

10/21/09 15:34:27 (4 years ago)

Author:

David Martín Clavo <david.martin.clavo@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

2bbc20

Parents:

0c8aad (diff), b50189 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'collaboration-fixes-round2' into fix-dmartinc

Conflicts:

indico/MaKaC/common/contextManager.py
indico/MaKaC/common/utils.py
indico/MaKaC/conference.py
indico/MaKaC/services/implementation/base.py
indico/MaKaC/services/implementation/conference.py
indico/MaKaC/services/interface/rpc/json.py
indico/MaKaC/webinterface/pages/conferences.py
indico/MaKaC/webinterface/rh/base.py
tests/MaKaC_tests/common_tests/testContextManager.py

File:

• indico/MaKaC/webinterface/pages/conferences.py (modified) (1 diff)

indico/MaKaC/webinterface/pages/conferences.py

@@ -2162 +2162 @@
         if not (canModify or isAnyCollaborationPluginManager):
             self._videoServicesMenuItem.setVisible(False)
-
+            
+        #we hide the Advanced Options section if it has no items
+        if not self._advancedOptionsSection.hasVisibleItems():
+            self._advancedOptionsSection.setVisible(False)
+        
         #tabs forced to be disabled for now
         self._participantsMenuItem.setVisible(False)