modify variable password to {password} on rms-newuser.html, fix the bug on OUA current user

c96b6500 · John Red Medrano · 977678cb · c96b6500 · c96b6500
Commit c96b6500 authored Sep 17, 2019 by John Red Medrano
Showing with 1 addition and 29 deletions

app/applicationlayer/management/user/serializers.py app/applicationlayer/management/user/serializers.py +1 -1

app/helper/email_service/templates/RMS-NEWUSER.html app/helper/email_service/templates/RMS-NEWUSER.html +0 -28

No files found.
--- a/app/applicationlayer/management/user/serializers.py
+++ b/app/applicationlayer/management/user/serializers.py
@@ -98,9 +98,9 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
                    mod = data.modules.all().values()
                    remove = []
                elif user.user_type == 'OUA':
+                    remove.remove("Company Management")
                    remove.remove("Department Management")
                    remove.remove("User Management")
-                    pass
                elif user.user_type == 'CUA':
                    remove.remove("Department Management")
                    remove.remove("User Management")

--- a/app/helper/email_service/templates/RMS-NEWUSER.html
+++ b/app/helper/email_service/templates/RMS-NEWUSER.html
-<<<<<<< HEAD
 <!DOCTYPE html>
 <html>
 <head>
@@ -28,31 +27,4 @@
 <img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
    
 </body>
-=======
-<!DOCTYPE html>
-<html>
-<head>
-<title>RMS: New User Created</title>
-</head>
-<body style="font-family: arial;">
-
-<h3>Resource Management System &#40;RMS&#41;</h3>
-<h3 style="color:#888888;">New User Created</h3><br>
-
-<p>Dear {name},</p><br>
-<p>You have been created as a new user of RMS. Please see your default login details below.</p><br>
-    
-<b>Username</b><br>{username}<br><br>
-<b>Password</b><br>password123<br><br>
-
-<p>You may change your password through the <u><a href="http://staging.rms.oneberrysystem.com/cms/profile/" style="text-decoration:underline;color:#007bff;" target="_blank">my profile</a></u> section of RMS any time.</p><br>
-    
-<p>Sincerely,</p>
-<p>RMS Team</p><br><br>
-    
-<p>Powered by</p>
-<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
-    
-</body>
->>>>>>> 319ca52a542ff76918cbe79ef0d144f8156c3abb
 </html>
\ No newline at end of file