R55099 - in /branches/14.2/infolog: ./ js/app.js

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55099

URL: http://svn.stylite.de/viewvc/egroupware?rev=55099&view=rev
Log:
fix javascript error when getState called by et2_ready from tutorials, caused by content.data.nm does not exist for tutorials

Modified:
branches/14.2/infolog/ (props changed)
branches/14.2/infolog/js/app.js

Propchange: branches/14.2/infolog/

— svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 16:49:14 2016
@@ -1,1 +1,1 @@
-/trunk/infolog:51376,51564,51630,51633,51645-51646,51648,51651,51658,51692,51760,51812,51817,51828,51935,51945-51946,51953,52021,52065,52075,52078,52111,52151,52238,52245,52265,52362,52381,52437,52467,52480,52506,52509,52536,52732,52735,52774,52782,52806,52809,52971-52973,52983-52988,53087,53116,53146-53147,53180,53194,53214,53449,53453,53500,53546,53562,53623,54165,54304,54332,54387,54391,54409,54443,54481,54557,54629,54668,55037-55038,55058
+/trunk/infolog:51376,51564,51630,51633,51645-51646,51648,51651,51658,51692,51760,51812,51817,51828,51935,51945-51946,51953,52021,52065,52075,52078,52111,52151,52238,52245,52265,52362,52381,52437,52467,52480,52506,52509,52536,52732,52735,52774,52782,52806,52809,52971-52973,52983-52988,53087,53116,53146-53147,53180,53194,53214,53449,53453,53500,53546,53562,53623,54165,54304,54332,54387,54391,54409,54443,54481,54557,54629,54668,55037-55038,55058,55098

Modified: branches/14.2/infolog/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/infolog/js/app.js?rev=55099&r1=55098&r2=55099&view=diff

— branches/14.2/infolog/js/app.js (original)
+++ branches/14.2/infolog/js/app.js Mon Feb 22 16:49:14 2016
@@ -145,7 +145,7 @@
if(et2)
{
var content = this.et2.getArrayMgr(‘content’);

•   	nm = content? content.data.nm: {};
  

•   	nm = content && content.data && content.data.nm ? content.data.nm: {};
    }
  
    state.action = nm.action || null;
  

---

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs