Subversion Repositories SmartDukaan

Rev

Rev 35802 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35802 Rev 36040
Line 47... Line 47...
47
                    #end
47
                    #end
48
                    <th>Category</th>
48
                    <th>Category</th>
49
                    <th>SubCategory</th>
49
                    <th>SubCategory</th>
50
                    <th>Message</th>
50
                    <th>Message</th>
51
                    <th>Created By</th>
51
                    <th>Created By</th>
-
 
52
                    #if($isCrmUser)
-
 
53
                        <th>Assigned To</th>
-
 
54
                    #end
52
                    <th>Created TimeStamp</th>
55
                    <th>Created TimeStamp</th>
53
                    #if($isCrmUser)
56
                    #if($isCrmUser)
54
                        <th>Assign</th>
57
                        <th>Assign</th>
55
                    #end
58
                    #end
56
                    #if($roleType)
59
                    #if($roleType)
Line 81... Line 84...
81
                                <td>$authUserMap.get($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy()).getFirstName() $authUserMap.get($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy()).getLastName()</td>
84
                                <td>$authUserMap.get($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy()).getFirstName() $authUserMap.get($activityMapWithActivityId.get($ticket.getFirstActivityId()).get(0).getCreatedBy()).getLastName()</td>
82
                            #else
85
                            #else
83
                                <td>Partner</td>
86
                                <td>Partner</td>
84
                            #end
87
                            #end
85
 
88
 
-
 
89
                            ## Assigned To column (only for CRM users)
-
 
90
                            #if($isCrmUser)
-
 
91
                                <td>
-
 
92
                                    #if($authUserListMap && $authUserListMap.get($ticket.getId()) && $authUserListMap.get($ticket.getId()).size() > 0)
-
 
93
                                        #foreach($authUser in $authUserListMap.get($ticket.getId()))
-
 
94
                                            <span>$authUser.getFirstName() $authUser.getLastName()</span><br/>
-
 
95
                                        #end
-
 
96
                                    #elseif($authUserIdAndAuthUserMap.get($ticket.getId()))
-
 
97
                                        $authUserIdAndAuthUserMap.get($ticket.getId()).getFirstName() $authUserIdAndAuthUserMap.get($ticket.getId()).getLastName()
-
 
98
                                    #else
-
 
99
                                        <span class="text-muted">-</span>
-
 
100
                                    #end
-
 
101
                                </td>
-
 
102
                            #end
-
 
103
 
86
                            <td>$ticket.getFormattedCreateTimestamp()</td>
104
                            <td>$ticket.getFormattedCreateTimestamp()</td>
87
                            #if($isCrmUser)
105
                            #if($isCrmUser)
88
                                ## Edit button - check permissions based on visibility and position
106
                                ## Edit button - check permissions based on visibility and position
89
                                #set($ticketCategoryId = $subCategoryIdAndCategoryMap.get($ticket.getSubCategoryId()).getId())
107
                                #set($ticketCategoryId = $subCategoryIdAndCategoryMap.get($ticket.getSubCategoryId()).getId())
90
                                #set($isVisibleSubCat = $subCategoryIdAndSubCategoryMap.get($ticket.getSubCategoryId()).isVisibility())
108
                                #set($isVisibleSubCat = $subCategoryIdAndSubCategoryMap.get($ticket.getSubCategoryId()).isVisibility())