Changeset 17901

Timestamp:

08/18/08 10:45:39 (3 months ago)

Author:

carlos

Message:

Fix for bug-5584:
added a new attribute to the insertTag for channels in order to indicate to not add a break line (<br clear="all">) after a channel.
It was needed to take off the <div id="schedule-grid"> from the channel (such div is where the indented and flat beta views are rendered), so the render of the grids when columns are added/removed, doesn't affect the channel.

Files:

• trunk/core/src/net/project/channel/Channel.java (modified) (2 diffs)
• trunk/core/src/net/project/channel/ChannelManager.java (modified) (1 diff)
• trunk/core/src/net/project/taglibs/channel/InsertTag.java (modified) (4 diffs)
• trunk/core/web/META-INF/tomcat/context.xml (modified) (1 diff)
• trunk/core/web/jsp/schedule/Main.jsp (modified) (2 diffs)
• trunk/core/web/jsp/schedule/include/taskList.jsp (modified) (1 diff)
• trunk/core/web/jsp/taglibs/channelTags.tld (modified) (1 diff)
• trunk/core/web/src/components/gridView.js (modified) (1 diff)
• trunk/core/web/src/indentedView.js (modified) (1 diff)

trunk/core/src/net/project/channel/Channel.java

@@ -84 +84 @@
-    private boolean m_actionBarOnly = false;
-    private boolean m_displayActionBar = false;
+    /* To not add a break line after the channel. By default we will add a break.*/
+    private boolean addBreak = true;
-
-    private final Hashtable m_includeAttributes = new Hashtable();
@@ -305 +307 @@
-    }
-
+    /**
+     * Gets the <code>addBreak</code> attribute, which indicates whether a break is needed after the channel rendering.
+     * @return the <code>addBreak</code> attribute
+     * @since 8.5
+     */
+    public boolean isAddBreak(){
+        return this.addBreak;
+    }
+    
+    /**
+     * Sets the <code>addBreak</code> attribute to indicate whether it is needed a break line after the channel
+     * @param addBreak the value to set into the <code>addBreak</code> attribute
+     * @since 8.5
+     */
+    public void setAddBreak(boolean addBreak){
+        this.addBreak = addBreak;
+    }
-    /**
-     * Sets included content to some JSP that has been transformed.  This

trunk/core/src/net/project/channel/ChannelManager.java

@@ -290 +290 @@
-                        // padding between it and the next
-                        isPadRequired = true;
-
+
+
+
+
+
+
-                    }
-                }

trunk/core/src/net/project/taglibs/channel/InsertTag.java

@@ -67 +67 @@
-    private Boolean actionBarOnly = null;
-    private Boolean isInIFrame = null;
+    private Boolean addBreak = null; /* To not add a break aftert the channel.*/
-
-    /**
@@ -114 +115 @@
-        if (actionBarOnly != null) {
-            channel.setActionbarOnly(actionBarOnly.booleanValue());
+        }
+        
+        if(this.addBreak != null){
+            channel.setAddBreak(this.addBreak.booleanValue());
-        }
-
@@ -211 +216 @@
-    public void setInIFrame(String isInIFrame) {
-        this.isInIFrame = new Boolean(Conversion.toBoolean(isInIFrame));
+    }
+    
+    /**
+     * Sets the <code>addBreak</code> attribute, to indicate whether to add a break line after the channel.
+     * @param addBreak the value to set the <code>addBreak</code> attribute
+     * @since 8.5
+     */
+    public void setAddBreak(String addBreak){
+        this.addBreak = new Boolean(Conversion.toBoolean(addBreak));
-    }
-
@@ -238 +252 @@
-        isInIFrame = null;
-        defaultState = null;
+        this.addBreak = null;
-    }
-

trunk/core/web/META-INF/tomcat/context.xml

@@ -6 +6 @@
-  <Resource name="jdbc/PnetDB" auth="Container"
-            type="javax.sql.DataSource" username="pnet_user" password="pnet_user"
-pnetdb
+v84dev
-            maxActive="8" maxIdle="4"/>
-

trunk/core/web/jsp/schedule/Main.jsp

@@ -1501 +1501 @@
-    <channel:insert name="Schedule_Tasks_List"
-                    title='<%=PropertyProvider.get("prm.schedule.main.channel.schedulelist.title")%>'
-
+ addBreak="false"
-                    include="include/taskList.jsp">
-        <channel:button type="expand_all"/>
@@ -1518 +1518 @@
-    </channel:insert>
-</channel:channel>
+<div id="schedule-grid"></div>
-</form>
-<%@ include file="/help/include_outside/footer.jsp" %>

trunk/core/web/jsp/schedule/include/taskList.jsp

@@ -375 +375 @@
-</pnet-xml:transform>
-<%}%>
-<div id='schedule-grid'></div>

trunk/core/web/jsp/taglibs/channelTags.tld

@@ -138 +138 @@
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
+        <attribute>
+            <name>addBreak</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
-    </tag>
-    

trunk/core/web/src/components/gridView.js

@@ -394 +394 @@
-            autoHeight: true,
-            autoSizeColumns: true,
-
-
+
-        });
-        

trunk/core/web/src/indentedView.js

@@ -203 +203 @@
-                enableRowBody : true
-                ,forceFit: true
-}
-
+    ,emptyText: 'It is no data available to be displayed.'
+}
-        });
-        grid.render();