Changeset 17ba50 in indico

Timestamp:

04/23/12 14:39:56 (13 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

b521ee

Parents:

cfc263

git-author:

Claude Bossy <claude.bossy@…> (02/29/12 11:40:48)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/23/12 14:39:56)

Message:

[IMP] Domain protection control - interface

Location:

indico/MaKaC

Files:

• services/implementation/conference.py (modified) (3 diffs)
• webinterface/tpls/ConfModificationControlFrame.tpl (modified) (1 diff)
• webinterface/tpls/ConfRegFormPersonalDataDisplay.tpl (modified) (1 diff)
• webinterface/tpls/DomainControlFrame.tpl (modified) (1 diff)
• webinterface/wcomponents.py (modified) (1 diff)

indico/MaKaC/services/implementation/conference.py

@@ -51 +51 @@
 from MaKaC.participant import Participant
 from MaKaC.common.Configuration import Config
+import MaKaC.domain as domain
 
 import datetime
@@ -1211 +1212 @@
         elif isinstance(userToRemove, Avatar) or isinstance(userToRemove, Group) :
             self._conf.revokeAccess(userToRemove)
+
+class ConferenceProtectionToggleDomains(ConferenceModifBase):
+
+    def _checkParams(self):
+        ConferenceModifBase._checkParams(self)
+        pm = ParameterManager(self._params)
+        self._domainId = pm.extract("domainId", pType=str)
+        self._add = pm.extract("add", pType=bool)
+
+    def _getAnswer(self):
+        dh = domain.DomainHolder()
+        if self._add :
+            self._target.requireDomain( dh.getById( self._domainId ) )
+        elif not self._add :
+            self._target.freeDomain( dh.getById( self._domainId ) )
 
 class ConferenceProtectionSetAccessKey(ConferenceModifBase):
@@ -1590 +1606 @@
     "protection.addAllowedUsers": ConferenceProtectionAddUsers,
     "protection.removeAllowedUser": ConferenceProtectionRemoveUser,
+    "protection.toggleDomains": ConferenceProtectionToggleDomains,
     "protection.setAccessKey": ConferenceProtectionSetAccessKey,
     "protection.setModifKey": ConferenceProtectionSetModifKey,

indico/MaKaC/webinterface/tpls/ConfModificationControlFrame.tpl

@@ -33 +33 @@
                 $E('setModifKey').dom.onsubmit = function(e) {
                     var modifKey = $E('modifKey').dom.value;
-                    if(modifKey && !confirm('${_("Please note that it is more secure to make the event private instead of using a modification key.")}')) {
+                    if(modifKey && !confirm(${_("Please note that it is more secure to make the event private instead of using a modification key.")|n,j})) {
                         return false;
                     }

indico/MaKaC/webinterface/tpls/ConfRegFormPersonalDataDisplay.tpl

@@ -1 +1 @@
 <table width="100%" align="left" cellspacing="0">
     <tr>
-        <td nowrap class="regFormSectionTitle">${ _("Personal data") }</td>
+        <td nowrap class="regFormSectionTitle">${ _("Personal data")}</td>
     </tr>
     <tr>

indico/MaKaC/webinterface/tpls/DomainControlFrame.tpl

@@ -1 +1 @@
 <table class="groupTable">
 <tr>
-  <td colspan="2"><div class="groupTitle">${ _("Domain control")}</div></td>
+  <td colspan="2"><div class="groupTitle">${ _("Domain control ")}<span id="domainControl"></span></div></td>
 </tr>
 <tr>
   <td nowrap class="titleCellTD"><span class="titleCellFormat">${ _("Allowed domains")}<br><font size="-2">(${ _("if no domain is selected<br>no control is applied")})</font></span></td>
   <td class="blacktext">
-    <form action="${ removeURL }" method="POST">
     ${ locator }
-    <table width="100%">
-    <tr>
-      <td width="80%">
+    <table width="auto">
         ${ domains }
-      </td>
-      <td width="20%" align="right" valign="bottom">
-        <table>
-        <tr>
-          <td>
-            <input type="submit" class="btn" value="${ _("remove")}">
-          </td>
-          <td>
-            <select name="addDomain">
-            <option>${ _("Select")}:
-            ${ domainsToAdd }
-            </select>
-          </td>
-          <td>
-            <input type="submit" class="btn" value="<- ${ _("add")}<" onClick="if (this.form.addDomain.value=='${ _("Select")}:') { return false; } else { this.form.action='${ addURL }'; }">
-          </td>
-        </tr>
-        </table>
-      </td>
-    </tr>
     </table>
-    </form>
   </td>
 </tr>
 </table>
+<script type="text/javascript">
+IndicoUI.executeOnLoad(function(){
+    if ($(':checkbox:checked').length==0){
+        $('#domainControl').text(${ _("(disabled)")|n,j});
+        $('#domainControl').attr('style','color: #B02B2C;');
+    }
+    else{
+        $('#domainControl').text(${ _("(enabled)")|n,j});
+        $('#domainControl').attr('style','color: #128F33;');
+    }
+});
+var checkId = null;
+$(':checkbox:not(:checked)').live('change', function(){
+    checkId = $(this).val();
+    indicoRequest('event.protection.toggleDomains', {
+        confId: ${conference.getId()},
+        domainId: $(this).val(),
+        add: false
+    },
+    function(result, error) {
+        var domain = '#domain'+checkId;
+        if ($(':checkbox:checked').length==0){
+            $('#domainControl').text(${ _("(disabled)")|n,j});
+            $('#domainControl').attr('style','color: #B02B2C;');
+        }
+        $(domain).attr('style','margin-left:10px; color:#B02B2C;');
+        $(domain).text("saved");
+        setTimeout(function(){
+            $(domain).text("");
+        }, 1000);
+        if(error) {
+            IndicoUtil.errorReport(error);
+        } else{
+            (new AlertPopup($T('Domain removed'))).open();
+        }
+    });
+});
+$(':checkbox:checked').live('change', function(){
+    checkId = $(this).val();
+    indicoRequest('event.protection.toggleDomains', {
+        confId: ${conference.getId()},
+        domainId: $(this).val(),
+        add: true
+    },
+    function(result, error) {
+        var domain = '#domain'+checkId;
+        if ($(':checkbox:checked').length!=0){
+            $('#domainControl').text(${ _("(enabled)")|n,j});
+            $('#domainControl').attr('style','color: #128F33;');
+        }
+        $(domain).attr('style','margin-left:10px; color:#B02B2C;');
+        $(domain).text("saved");
+        setTimeout(function(){
+            $(domain).text("");
+        }, 1000);
+        if(error) {
+            IndicoUtil.errorReport(error);
+        } else{
+            (new AlertPopup($T('Domain added'))).open();
+        }
+    });
+});
+</script>

indico/MaKaC/webinterface/wcomponents.py

@@ -2279 +2279 @@
         vars = WTemplated.getVars( self )
         l = []
-        for dom in self._target.getDomainList():
-            l.append("""<input type="checkbox" name="selectedDomain" value="%s"> %s"""%(dom.getId(), dom.getName()))
-        vars["domains"] = "<br>".join(l)
-        l = []
         for dom in domain.DomainHolder().getList():
             if dom not in self._target.getDomainList():
-                l.append("""<option value="%s">%s</option>"""%(dom.getId(), dom.getName()))
-        vars["domainsToAdd"] = "".join(l)
+                l.append("""<tr><td><input type="checkbox" name="selectedDomain" value="%s"> %s</td><td><span id="domain%s"></span></td></tr>"""%(dom.getId(), dom.getName(), dom.getId()))
+            else:
+                l.append("""<tr><td><input type="checkbox" name="selectedDomain" value="%s" checked> %s</td><td><span id="domain%s"></span></td></tr>"""%(dom.getId(), dom.getName(), dom.getId()))
+        vars["domains"] = "".join(l)
         vars["removeURL"] = self._removeURL
         vars["addURL"] = self._addURL
         vars["locator"] = self._target.getLocator().getWebForm()
+        vars["conference"] = self._target
         return vars