Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
1bab0571
Commit
1bab0571
authored
Sep 19, 2017
by
Nilu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
show client only if client management is available, J005, J008
parent
b4e903fe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
14 deletions
+34
-14
edit_job.jsp
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
+16
-6
job_review_submit.jsp
...bApp/webroot/extensions/adminportal/job_review_submit.jsp
+18
-8
No files found.
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
View file @
1bab0571
...
...
@@ -42,12 +42,22 @@
</div>
<div class="optional-title">OPTIONAL</div>
<div class="row">
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
</div>
</div>
<%
SecUser txUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
if(companyUser.getCompany().showHasClientSupport())
{
%>
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
</div>
</div>
<%
}
%>
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="ReferenceNumber" cssClass="form-control" />
...
...
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
View file @
1bab0571
...
...
@@ -72,14 +72,24 @@
<oneit:toString value="<%= job.getJobType() %>" mode="EscapeHTML" />
</div>
</div>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">
<oneit:label GUIName="Client" />
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" />
</div>
</div>
<%
SecUser txUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
if(companyUser.getCompany().showHasClientSupport())
{
%>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">
<oneit:label GUIName="Client" />
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" />
</div>
</div>
<%
}
%>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">
<oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" />
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment