Changeset 28df4d in indico

Timestamp:

11/30/10 11:42:42 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

afa6cd

Parents:

bad973

git-author:

Leszek Syroka <leszek.marek.syroka@…> (11/25/10 16:33:14)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (11/30/10 11:42:42)

Message:

[FIX] i18n affecting protection settings

• buttons responsible for checking conference, cateofry, session and contribution protection now has different 'name' attribute. Server action depends on the 'name' not on the 'value'.
• fix#578

Location:

indico/MaKaC/webinterface

Files:

• rh/categoryMod.py (modified) (1 diff)
• rh/conferenceModif.py (modified) (1 diff)
• rh/contribMod.py (modified) (1 diff)
• rh/sessionModif.py (modified) (1 diff)
• tpls/AccessControlStatusFrame.tpl (modified) (1 diff)

indico/MaKaC/webinterface/rh/categoryMod.py

@@ -599 +599 @@
     def _process( self ):
         params = self._getRequestParams()
-        if params["visibility"] == "PRIVATE":
+        if params.has_key("changeToPrivate"):
             self._target.setProtection( 1 )
-        elif params["visibility"] == "INHERITING":
+        elif params.has_key("changeToInheriting"):
             self._target.setProtection( 0 )
-        elif params["visibility"] == "PUBLIC":
+        elif params.has_key("changeToPublic"):
             # The 'Home' category is handled as a special case.
             # We maintain the illusion for the user of it being either

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -1693 +1693 @@
     def _checkParams( self, params ):
         RHConferenceModifBase._checkParams( self, params )
-        if params["visibility"] == "PRIVATE":
+        if params.has_key("changeToPrivate"):
             self._protectConference = 1
-        elif params["visibility"] == "INHERITING":
+        elif params.has_key("changeToInheriting"):
             self._protectConference = 0
-        elif params["visibility"] == "PUBLIC":
+        elif params.has_key("changeToPublic"):
             self._protectConference = -1
 

indico/MaKaC/webinterface/rh/contribMod.py

@@ -1430 +1430 @@
     def _process(self):
         params = self._getRequestParams()
-        privacy = params.get("visibility","INHERITING")
-        self._protect = 0
-        if privacy == "PRIVATE":
+        if params.has_key("changeToPrivate"):
             self._protect = 1
-        elif privacy == "INHERITING":
+        elif params.has_key("changeToInheriting"):
             self._protect = 0
-        elif privacy == "PUBLIC":
+        elif params.has_key("changeToPublic"):
             self._protect = -1
         self._target.setProtection(self._protect)

indico/MaKaC/webinterface/rh/sessionModif.py

@@ -1176 +1176 @@
     def _checkParams( self, params ):
         RHSessionModifBase._checkParams( self, params )
-        privacy = params.get("visibility","INHERITING")
-        self._protect = 0
-        if privacy == "PRIVATE":
+        if params.has_key("changeToPrivate"):
             self._protect = 1
-        elif privacy == "INHERITING":
+        elif params.has_key("changeToInheriting"):
             self._protect = 0
-        elif privacy == "PUBLIC":
+        elif params.has_key("changeToPublic"):
             self._protect = -1
 

indico/MaKaC/webinterface/tpls/AccessControlStatusFrame.tpl

@@ -136 +136 @@
                 <% if privacy == 'PRIVATE' or privacy == 'INHERITING': %>
                 <div class="ACModifButtonEntry">
-                    <%= _("Make it")%> <input type="submit" class="btn" name="visibility" value="<%= _("PUBLIC")%>"> <%= _("(viewable by all the users, regardless of the access protection of the parent " + termsDict[type]['parentName'])%> '<%= parentName %>').
+                    <%= _("Make it")%> <input type="submit" class="btn" name="changeToPublic" value="<%= _("PUBLIC")%>"> <%= _("(viewable by all the users, regardless of the access protection of the parent " + termsDict[type]['parentName'])%> '<%= parentName %>').
                 </div>
                 <% end %>
                 <% if privacy == 'PUBLIC' or privacy == 'INHERITING': %>
                 <div class="ACModifButtonEntry">
-                    <%= _("Make it")%> <input type="submit" class="btn" name="visibility" value="<%= _("PRIVATE")%>"> <%= _("(viewable only by the users you choose, regardless of the access protection of the parent " + termsDict[type]['parentName'])%> '<%= parentName %>').
+                    <%= _("Make it")%> <input type="submit" class="btn" name="changeToPrivate" value="<%= _("PRIVATE")%>"> <%= _("(viewable only by the users you choose, regardless of the access protection of the parent " + termsDict[type]['parentName'])%> '<%= parentName %>').
                 </div>
                 <% end %>
                 <% if privacy == 'PUBLIC' or privacy == 'PRIVATE': %>
                 <div class="ACModifButtonEntry">
-                    <%= _("Make it")%> <input type="submit" class="btn" name="visibility" value="<%= _("INHERITING")%>"> <%= _("the access protection from its parent " + termsDict[type]['parentName'])%> '<%= parentName %>' (<span class=ACStatus style="color: <%=parentStatusColor%>;"><%= _(parentPrivacy)%></span> <%= _("for the moment).")%>
+                    <%= _("Make it")%> <input type="submit" class="btn" name="changeToInheriting" value="<%= _("INHERITING")%>"> <%= _("the access protection from its parent " + termsDict[type]['parentName'])%> '<%= parentName %>' (<span class=ACStatus style="color: <%=parentStatusColor%>;"><%= _(parentPrivacy)%></span> <%= _("for the moment).")%>
                 </div>
                 <% end %>