mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-30 20:51:22 +00:00 
			
		
		
		
	Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
		
						commit
						fdfad60c97
					
				|  | @ -1005,7 +1005,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { | |||
| 				if($user->isAdmin() || $a["status"] > -2) { | ||||
| 					print "<tr>\n"; | ||||
| 					print "<td>".$reqName."</td>\n"; | ||||
| 					print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>"; | ||||
| 					print "<td><i style=\"font-size: 80%;\">".$a["date"]." - "; | ||||
| 					/* $updateUser is the user who has done the approval */ | ||||
| 					$updateUser = $dms->getUser($a["userID"]); | ||||
| 					print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";	 | ||||
|  | @ -1036,7 +1036,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { | |||
| 					} | ||||
| 
 | ||||
| 					print "</ul>"; | ||||
| 					print "</td>\n";	 | ||||
| 					print "</td>\n"; | ||||
| 					print "</tr>\n"; | ||||
| 				} | ||||
| 			} | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann