reqmgr2 code merge

bin/wmstats-update-status.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+from optparse import OptionParser
+from WMCore.Services.WMStats.WMStatsWriter import WMStatsWriter
+
+def updateRequestStatus(couchURL, requestList, status):
+    ww = WMStatsWriter(couchURL)
+    for request in requestList:
+        ww.updateRequestStatus(request, status)
+        print "%s is udated to %s" % (request, status)
+
+if __name__ == "__main__":
+    parser =  OptionParser()
+    parser.add_option("--url", dest = "url",
+                     help = "type couch db url")
+    parser.add_option("--status", dest = "status",
+                     help = "type purge or delete url")
+    parser.add_option("--requests", dest = "requests",
+                     help = "type last seq")
+    (options, args) = parser.parse_args()
+    if options.url:
+        updateRequestStatus(options.url, options.requests, options.status)

src/couchapps/ReqMgr/updates/updaterequest.js

@@ -1,14 +1,14 @@
 // update function
 // input: valueKey (what to change), value - new value
-function(doc, req)
-{
+function(doc, req) {
     if (doc === null) {
     	return [null, "Error: document not found"];
     };
 
     function updateTransition() {
         var currentTS =  Math.round((new Date()).getTime() / 1000);
-        var statusObj = {"Status": doc.RequestStatus, "UpdateTime": currentTS};
+        var dn = doc.DN || null;
+        var statusObj = {"Status": doc.RequestStatus, "UpdateTime": currentTS, "DN": dn};
 
         if (!doc.RequestTransition) {
             doc.RequestTransition = new Array();
@@ -30,6 +30,9 @@ function(doc, req)
             key == "InputDatasetTypes" ||
             key == "InputDatasets" ||
             key == "OutputDatasets" ||
+            key == "CustodialSites" ||
+            key == "NoneCustodialSites" ||
+            key == "AutoApproveSubscriptionSites" ||
             key == "Teams") {
 
     		doc[key] = JSON.parse(newValues[key]);
@@ -42,4 +45,4 @@ function(doc, req)
         }
     }
     return [doc, "OK"];
-}
+}

src/couchapps/ReqMgr/views/bycampaign/map.js

@@ -1,5 +1,5 @@
 function(doc) {
   if (doc.Campaign){
-    emit(doc.Camaign, null) ;
+     emit(doc.Campaign, null) ;
   } 
 }

src/html/ReqMgr/javascript/ajax_utils.js

@@ -0,0 +1,35 @@
+function cleanConfirmation () {
+  var doc = document.getElementById('confirmation');
+  doc.innerHTML='';
+  doc.className='';
+}
+function ajaxRequest(path, parameters) {
+    // path is an URI binded to certain server method
+    // parameters is dict of parameters passed to the server function
+    new Ajax.Updater('response', path,
+    { method: 'post' ,
+      parameters : parameters,
+      onCreate: function() {
+          var doc = document.getElementById('confirmation');
+          doc.innerHTML='Your request has been submitted';
+          doc.className='tools-alert tools-alert-blue confirmation shadow';
+      },
+      onException: function() {
+          var doc = document.getElementById('confirmation');
+          doc.innerHTML='ERROR! Your request has been failed';
+          doc.className='tools-alert tools-alert-red confirmation shadow';
+          setTimeout(cleanConfirmation, 5000);
+      },
+      onComplete : function(response) {
+          var doc = document.getElementById('confirmation');
+          if  (response.status==200 || response.status==201) {
+              doc.innerHTML='SUCCESS! Your request has been processed with status '+response.status;
+              doc.className='tools-alert tools-alert-green confirmation shadow';
+          } else {
+              doc.innerHTML='WARNING! Your request has been processed with status '+response.status;
+              doc.className='tools-alert tools-alert-yellow confirmation shadow';
+          }
+          setTimeout(cleanConfirmation, 5000);
+      }
+    });
+}