WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/rtree.asp

 '----------------------------------------------------------------------------------------------------------------------------------------------
 Sub RenderLxrState()
     Response.Write RenderLxrStateString(rsQry("rtag_id"),rsQry("lxr"),rsQry("lxrserver"),rsQry("official"),"")
 End Sub
 '----------------------------------------------------------------------------------------------------------------------------------------------
-Function RenderActions(nRtagId, sOfficial)
+Function RenderActions(nRtagId, sOfficial, nCanDelete)
-    Response.Write "<span title='Select operation from dropdown menu' class='select-operation ui-icon ui-icon-triangle-1-s' data-rtag-id='"&nRtagId&"' data-official='"&sOfficial&"' style='display:inline-block'></span>"
+    Response.Write "<span title='Select operation from dropdown menu' " &_
+                       "class='select-operation ui-icon ui-icon-triangle-1-s' " &_
+                       "data-rtag-id='" & nRtagId &_
+                       "' data-official='"& sOfficial &_
+                       "' data-candelete='"& nCanDelete &_
+                       "' style='display:inline-block'>"&_
+                   "</span>"
 End Function
 '----------------------------------------------------------------------------------------------------------------------------------------------
 Function GetMassRefComments (nRtagId)
    Dim UsedBy
    Dim rsQryUse
              archive : function (data) {
                  //console.log("Archiving:", data.rtagid);
                  this.gotoUrl("_change_release_mode.asp", {rtag_id : data.rtagid, mode_code : 5 , rfile : "<%=ScriptName%>"});
              },
-<%If bCanDestroy Then%>
+<%If objAccessControl.UserLogedIn Then%>
              delete : function (data) {
                  //console.log("Delete:", data.rtagid);
                  $.miniMenu.currentRow.addClass('body_row_sel_outline');
                  var that = this;
                  var delObject = $.Deferred(that.confirmDelete
         var official = $(this).data('official');
         $('#select-menu-close').toggleClass('ui-state-disabled',! $.mode2access.canAccess(official,0));
         $('#select-menu-preserve').toggleClass('ui-state-disabled',!$.mode2access.canAccess(official,1));
         $('#select-menu-archive').toggleClass('ui-state-disabled',! $.mode2access.canAccess(official,2));
+        // Set initial state destroy
+        var canDestroy = $(this).data('candelete') || <%=iif(bCanDestroy,"1","0")%>
+        $('#select-menu-destroy').toggleClass('ui-state-disabled',(canDestroy == 0));
         // Highlight the row selected
         $('#releaseTree .body_row_sel').removeClass('body_row_sel');
         $.miniMenu.currentRow = $(event.target).closest('tr').addClass('body_row_sel');
         // Allow click outside of the menu to close it
                            <td width="1%" nowrap class="body_txt">Lxr</td>
                            <td width="3%" nowrap class="body_txt">Daemon&nbsp;Status</td>
                            </tr>
                            <%
                            OraDatabase.Parameters.Add "PROJ_ID",  parProjId,  ORAPARM_INPUT, ORATYPE_NUMBER
+                           OraDatabase.Parameters.Add "USER_ID",  objAccessControl.UserId,  ORAPARM_INPUT, ORATYPE_NUMBER
                            Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("ReleaseVersionTree.sql") , ORADYN_DEFAULT )
                            lastLevel = 0
+                           OraDatabase.Parameters.Remove "USER_ID"
                            OraDatabase.Parameters.Remove "PROJ_ID"
                            Dim lastRtagId, parentRtag_id
                            If rsQry.RecordCount > 0 Then
                               While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
                                  currLevel = CInt(rsQry("hierarchy"))
                                  hoverTitle = "Last change: "& rsQry("OFFICIAL_STAMP") & " by " & rsQry("modifier")
                                  createdBy = rsQry("created_stamp") & " by " & rsQry("creator")
+                                 If rsQry("userCanDelete") = 1 Then
+                                     createdBy = createdBy & "<br>Creator can delete"
+                                 End If
                                  %>
                                  <tr class="body_rowg2">
                                     <td nowrap>
                                        <%Call RenderIndent( lastLevel, currLevel )%>
-                                       <%Call RenderActions(rsQry("rtag_id"),rsQry("official"))%>
+                                       <%Call RenderActions(rsQry("rtag_id"),rsQry("official"),rsQry("userCanDelete"))%>
                                        <a href="dependencies.asp?rtag_id=<%=rsQry("rtag_id")%>" class="body_link" title="<%=hoverTitle%>" >
                                        <%=ReleaseIcon( rsQry("official") )%>&nbsp;<%=rsQry("rtag_name")%></a>
                                     </td>
                                     <td nowrap valign=top"><%=createdBy%></td>
                                     <%
                               <%End If%>
                               <td width="1%" class="body_txt" title="LXR Support enabled">Lxr</td>
                               <td width="3%" class="body_txt">Daemon Status</td>
                            </tr>
                            <%
-                              OraDatabase.Parameters.Add "PROJ_ID",  parProjId,  ORAPARM_INPUT, ORATYPE_NUMBER
+                              OraDatabase.Parameters.Add "PROJ_ID",  parProjId,                ORAPARM_INPUT, ORATYPE_NUMBER
+                              OraDatabase.Parameters.Add "USER_ID",  objAccessControl.UserId,  ORAPARM_INPUT, ORATYPE_NUMBER
                               rsQryStr = GetQuery ("ReleaseVersionList.sql")
                               rsQryStr = Replace(rsQryStr, "/*SHOW_FILTER*/", parShowFilter)
                               Set rsQry = OraDatabase.DbCreateDynaset( rsQryStr, ORADYN_DEFAULT )
+                              OraDatabase.Parameters.Remove "USER_ID"
                               OraDatabase.Parameters.Remove "PROJ_ID"
                               If rsQry.RecordCount > 0 Then
                                  Set objDmSts = New DaemonStatus
                                  Call objDmSts.GetDaemonStatus(parProjId)
                                  While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
                                     hoverTitle = "Last change: "& rsQry("OFFICIAL_STAMP") & " by " & rsQry("modifier") & ". " & rsQry("OFFICIAL_STAMP_DAYS")& " Days ago"
                                     createdBy = rsQry("created_stamp") & " by " & rsQry("creator")
+                                    If rsQry("userCanDelete") = 1 Then
+                                        createdBy = createdBy & "<br>Creator can delete"
+                                    End If
                                     %>
                                     <tr class="body_rowg2">
                                        <td valign="top">
-                                          <%Call RenderActions(rsQry("rtag_id"),rsQry("official"))%>
+                                          <%Call RenderActions(rsQry("rtag_id"),rsQry("official"),rsQry("userCanDelete"))%>
                                        </td>
                                        <td nowrap valign="top">
                                           <a href="dependencies.asp?rtag_id=<%=rsQry("rtag_id")%>" class="body_link" title="<%=hoverTitle%>">
                                           <%=ReleaseIcon( rsQry("official"))%>&nbsp;<%=rsQry("rtag_name")%></a>
                                        </td>
     <li id="select-menu-preserve" data-opr="preserve" >Preserve Release</li>
     <li id="select-menu-archive" data-opr="archive" >Archive Release</li>
     <li>-</li>
     <li <%=iif(bCanClone,"data-opr=clone","class=ui-state-disabled")%> title="Create a new Release based on selected Release">Clone Release</li>
     <li>-</li>
-    <li <%=iif(bCanDestroy,"data-opr=delete","class=ui-state-disabled")%>  title="Delete the selected Release">Destroy Release</li>
+    <li id="select-menu-destroy" data-opr="delete", title="Delete the selected Release">Destroy Release</li>
     <li>-</li>
     <li>Close Menu</li>
   </ul>
 </div>
 <!-- FOOTER -->

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/rtree.asp @ 5504 – Rev 5357 → 5394