Changeset 9d6eb3 in indico

Timestamp:

05/12/10 10:43:13 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

4e4d928

Parents:

0a4b4c

git-author:

Leszek Syroka <leszek.marek.syroka@…> (05/03/10 14:03:52)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (05/12/10 10:43:13)

Message:

[FIX] Problems with material widget

• sometimes Ids of conference, session, contribution etc. contains not only numbers but letters.
• sometimes 'null' values is stored as a string containing word 'null'.
• fix#217

Location:

indico

Files:

• MaKaC/webinterface/stylesheets/include/common.xsl (modified) (1 diff)
• htdocs/js/indico/MaterialEditor/Editor.js (modified) (3 diffs)

indico/MaKaC/webinterface/stylesheets/include/common.xsl

@@ -145 +145 @@
         <xsl:value-of select="$alignMenuRight"/>
         <xsl:text disable-output-escaping="yes"><![CDATA[);</script>]]></xsl:text>
-
-        <!--
-        <xsl:if test="$item/modifyLink != ''">
-            <a href="{$item/modifyLink}"><img src="images/manage.png"  alt="modify this item" title="modify this item" style="vertical-align: middle;"/></a>
-        </xsl:if>
-        <xsl:if test="$item/minutesLink != ''">
-            <a href="#" onclick="IndicoUI.Dialogs.writeMinutes({$confId},{$sessId},{$contId},{$subContId});return false;"><img src="images/write_minutes.png" alt="write minutes" style="vertical-align: middle; margin-left:2px;margin-right:0px;" title="write minutes"/></a>
-        </xsl:if>
-        <xsl:if test="$item/materialLink != ''">
-            <a href="#" onclick="IndicoUI.Dialogs.Material.editor({$confId},{$sessId},{$contId},{$subContId},Indico.Data.MaterialTypes.meeting, {$uploadURL});return false;"><img src="images/file_shadow.png" border="0" alt="submit material" style="vertical-align: middle; margin-left:2px;margin-right:0px;" title="submit material"/></a>
-        </xsl:if>
-        -->
     </xsl:if>
 

indico/htdocs/js/indico/MaterialEditor/Editor.js

@@ -1002 +1002 @@
 
     _drawItem: function(pair) {
-
         var self = this;
 
@@ -1266 +1265 @@
 
         var args = {
-            'categId': intToStr(this.categId),
-            'confId': intToStr(this.confId),
-            'sessionId': intToStr(this.sessId),
-            'contribId': intToStr(this.contId),
-            'subContId': intToStr(this.subContId),
+            'categId': this.categId,
+            'confId': this.confId,
+            'sessionId': this.sessId,
+            'contribId': this.contId,
+            'subContId': this.subContId,
             'parentProtected': this.parentProtected
         };
@@ -1276 +1275 @@
         // Remove null parameters
         each(args, function(value, key) {
-            if (value === null) {
+            //sometimes 'null' value is set as a string
+            if (value === null || value === undefined || value =="null") {
                 delete args[key];
             }