Merge branch 'fix/lp_modify' into 'wrdp'

Merge of fix/lp_modify bug修复 to wrdp

See merge request o2oa/o2oa!3369

o2web/source/x_component_Attendance/AbnormalExport.js

@@ -43,7 +43,7 @@ MWF.xApplication.Attendance.AbnormalExport = new Class({
     },
     createYearSelectTd : function( tr ){
         var _self = this;
-        var td = new Element("td", {  "styles" : this.css.filterTableTitle, "text" : "年度"  }).inject(tr);
+        var td = new Element("td", {  "styles" : this.css.filterTableTitle, "text" : this.app.lp.annuaal }).inject(tr);
         var td = new Element("td", {  "styles" : this.css.filterTableValue }).inject(tr);
         this.yearString = new MDomItem( td, {
             "name" : "yearString",

o2web/source/x_component_Attendance/lp/zh-cn.js

@@ -49,7 +49,6 @@ MWF.xApplication.Attendance.LP = {
 	"abNormalDutyCount" : "异常打卡人次",
 	"resultNormal" : "正常打卡次数",
 	"seriousLateTimes": "严重迟到次数",
-	"leaveEarlyTimes": "早退次数",
 	"absenteeismTimes": "矿工次数",
 	"notSignedCount": "未打卡次数",
 

o2web/source/x_component_Forum/TopNode.js

@@ -201,7 +201,7 @@ MWF.xApplication.Forum.TopNode = new Class({
             //}).inject(this.personNode);
             this.personTextNode = new Element("div", {
                 "styles": this.css.personTextNode,
-                "text": MWF.xApplication.Forum.LP.welcomeTitle.replace("{n}", ( this.userName || "").split("@")[0]),
+                "text": MWF.xApplication.Forum.LP.welcomeTitle.replace("{user}", ( this.userName || "").split("@")[0]),
                 "title" : MWF.xApplication.Forum.LP.seePersonCenter
             }).inject(this.personNode);
             this.personNode.addEvent("click", function(){ this.openPerson(this.userName ) }.bind(this))

o2web/source/x_component_ForumDocument/Main.js

@@ -452,17 +452,17 @@ MWF.xApplication.ForumDocument.Main = new Class({
 	},
 	reloadAllParents : function(){
 		var aid = "Forum";
-		if (this.desktop.apps[aid]){
+		if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 			this.desktop.apps[aid].reload();
 		}
 
 		aid = "ForumCategory"+this.sectionData.forumId;
-		if (this.desktop.apps[aid]){
+		if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 			this.desktop.apps[aid].reload();
 		}
 
 		aid = "ForumSection"+this.sectionData.id;
-		if (this.desktop.apps[aid]){
+		if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 			this.desktop.apps[aid].reload();
 		}
 	},
@@ -1220,6 +1220,7 @@ MWF.xApplication.ForumDocument.Main = new Class({
 				}.bind(this)
 			},
 			onGotoItem : function( top ){
+				debugger;
 				var t = top - this.content.getTop();
 				this.contentContainerNode.scrollTo( 0, t );
 			}.bind(this)

o2web/source/x_component_ForumDocument/Vote.js

@@ -161,6 +161,7 @@ MWF.xApplication.ForumDocument.Vote = new Class({
 
     },
     createGroupVoted : function(data, idx){
+        var _self = this;
         var bgColor = this.getRandomColor();
         var maxWidth = "800";
         var sum = 0;
@@ -168,7 +169,7 @@ MWF.xApplication.ForumDocument.Vote = new Class({
         var contentUsePicture = false;
         data.voteOptions.each( function(opt){
             sum += parseInt( opt.chooseCount );
-            if( opt.optionContentType == this.lp.picture ){
+            if( opt.optionContentType == _self.lp.picture ){
                 contentUsePicture = true;
             }
         });
@@ -728,13 +729,13 @@ MWF.xApplication.ForumDocument.Vote = new Class({
 
         var returnStr = seconds + this.lp.second;
         if(minutes>0) {
-            returnStr = minutes + this.lp.mintue + returnStr;
+            returnStr = minutes + this.lp.minute + returnStr;
         }
         if(hours>0) {
             returnStr = hours + this.lp.hour + returnStr;
         }
         if(days>0) {
-            returnStr = days + thi.lp.day + returnStr;
+            returnStr = days + this.lp.day + returnStr;
         }
         return returnStr;
     },

o2web/source/x_component_ForumPerson/Main.js

@@ -123,17 +123,17 @@ MWF.xApplication.ForumPerson.Main = new Class({
 	reloadAllParents : function( sectionId ){
 		this.restActions.getSection( sectionId, function( json ){
 			var aid = "Forum";
-			if (this.desktop.apps[aid]){
+			if (this.desktop.apps[aid] && this.desktop.apps[aid].reload ){
 				this.desktop.apps[aid].reload();
 			}
 
 			aid = "ForumCategory"+json.data.forumId;
-			if (this.desktop.apps[aid]){
+			if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 				this.desktop.apps[aid].reload();
 			}
 
 			aid = "ForumSection"+sectionId;
-			if (this.desktop.apps[aid]){
+			if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 				this.desktop.apps[aid].reload();
 			}
 		}.bind(this) )

o2web/source/x_component_ForumSearch/Main.js

@@ -41,17 +41,17 @@ MWF.xApplication.ForumSearch.Main = new Class({
 	reloadAllParents : function( sectionId ){
 		this.restActions.getSection( sectionId, function( json ){
 			var aid = "Forum";
-			if (this.desktop.apps[aid]){
+			if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 				this.desktop.apps[aid].reload();
 			}
 
 			aid = "ForumCategory"+json.data.forumId;
-			if (this.desktop.apps[aid]){
+			if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 				this.desktop.apps[aid].reload();
 			}
 
 			aid = "ForumSection"+sectionId;
-			if (this.desktop.apps[aid]){
+			if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 				this.desktop.apps[aid].reload();
 			}
 		}.bind(this) )

o2web/source/x_component_ForumSection/Main.js

@@ -69,12 +69,12 @@ MWF.xApplication.ForumSection.Main = new Class({
 	},
 	reloadAllParents : function(){
 		var aid = "Forum";
-		if (this.desktop.apps[aid]){
+		if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 			this.desktop.apps[aid].reload();
 		}
 
 		aid = "ForumCategory"+this.sectionData.forumId;
-		if (this.desktop.apps[aid]){
+		if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){
 			this.desktop.apps[aid].reload();
 		}
 	},