Author: solomax
Date: Thu Aug 25 03:36:34 2016
New Revision: 1757596
URL: http://svn.apache.org/viewvc?rev=1757596&view=rev
Log:
[OPENMEETINGS-1455] recording hash is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java?rev=1757596&r1=1757595&r2=1757596&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
Thu Aug 25 03:36:34 2016
@@ -24,6 +24,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.room.SwfPanel.SWF;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_SETTINGS;
+import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -90,6 +91,7 @@ public class HashPage extends BaseInited
vp.update(null, rec);
}
recContainer.setVisible(true);
+ error = false;
}
Room r = i.getRoom();
if (r != null) {
@@ -126,7 +128,7 @@ public class HashPage extends BaseInited
if (roomId != null) {
pp.add(WICKET_ROOM_ID, roomId);
}
- SwfPanel rp = new SwfPanel(PANEL_MAIN, pp);
+ SwfPanel rp = new SwfPanel(CHILD_ID, pp);
replace(new MainPanel(PANEL_MAIN, rp));
rp.onMenuPanelLoad(null);
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1757596&r1=1757595&r2=1757596&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
Thu Aug 25 03:36:34 2016
@@ -30,7 +30,7 @@
</script>
</wicket:head>
<wicket:extend>
- <div wicket:id="main"/>
+ <div wicket:id="main" style="height: 100%"/>
<div wicket:id="invite-to-room"></div>
</wicket:extend>
</html>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java?rev=1757596&r1=1757595&r2=1757596&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
Thu Aug 25 03:36:34 2016
@@ -96,6 +96,7 @@ public class HashPage extends BaseInited
vp.update(null, rec);
}
recContainer.setVisible(true);
+ error = false;
}
Room r = i.getRoom();
if (r != null) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java?rev=1757596&r1=1757595&r2=1757596&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
Thu Aug 25 03:36:34 2016
@@ -96,6 +96,7 @@ public class HashPage extends BaseInited
vp.update(null, rec);
}
recContainer.setVisible(true);
+ error = false;
}
Room r = i.getRoom();
if (r != null) {
