fix request.py, view info about certificates

api/server/baseClass.py

@@ -477,8 +477,8 @@ class Basic (DefinitionBase) :
                         find_flag = True
                         break
                 if not find_flag:
-                    self.printSUCCESS(message = \
-                            _("Certificate %d can run all methods!") %cert_id)
+                    self.printSUCCESS(_("Certificate %d can run all methods!") \
+                                      %cert_id)
                     
             else:
                 results = []
@@ -526,26 +526,26 @@ class Basic (DefinitionBase) :
                 if results == []:
                     results.append("No Methods")
                 
-                self.printSUCCESS(message = _("Certificate %d can run: ") %cert_id)
+                self.printSUCCESS(_("Certificate %d can run: ") %cert_id)
                 for i in results:
-                    self.printSUCCESS(message = i)
+                    self.printSUCCESS(i)
             b = '<b>'
             _b = '</b>'
-            self.printSUCCESS(message = b+_('Certificate groups:')+_b+'\n' + \
+            self.printSUCCESS(b+_('Certificate groups:')+_b+'\n' + \
                               reduce (lambda x, y: x + '\n' + y, groups_list))
-            self.printSUCCESS(message = b+_("Fingerprint = ") +_b+\
+            self.printSUCCESS(b+_("Fingerprint = ") +_b+\
                               certobj.digest('SHA1'))
-            self.printSUCCESS(message = b+_("Serial Number = </b>") +_b +\
+            self.printSUCCESS(b+_("Serial Number = </b>") +_b +\
                               str(certobj.get_serial_number()))
-            self.printSUCCESS(message = ' ')
+            self.printSUCCESS(' ')
             Issuer = certobj.get_issuer().get_components()
-            self.printSUCCESS (message = b+_("\nIssuer") +_b)
+            self.printSUCCESS (b+_("\nIssuer") +_b)
             for i in Issuer:
-                self.printSUCCESS (message = "%s : %s" %(i[0], i[1]))
+                self.printSUCCESS ("%s : %s" %(i[0], i[1]))
             Subject = certobj.get_subject().get_components()
-            self.printSUCCESS (message = b+_("\nSubject") +_b)
+            self.printSUCCESS (b+_("\nSubject") +_b)
             for item in Subject:
-                self.printSUCCESS (message = "%s : %s" %(item[0], item[1]))
+                self.printSUCCESS ("%s : %s" %(item[0], item[1]))
             return True
         # Обработка сигнала прерывания работы процесса
         except KeyboardInterrupt:

api/server/request.py

@@ -87,7 +87,7 @@ class ApiWsdl:
             list_req_id.sort()
             max_id = list_req_id[len(list_req_id)-1]
 
-            self.startTask('Current offset = %d' %page_offset)
+            self.printSUCCESS('Current offset = %d' %page_offset)
             if not page_count:
                 page_count = len(list_req_id)
 
@@ -120,11 +120,9 @@ class ApiWsdl:
                 body.append([str(i),username,ip,mac,date,location,group])
                 i+=1
 
-            if not body:
-                body.append(['','','','','','',''])
-            self.printTable(head, body, "Request Table", fields = fields, \
+            if body:
+                self.printTable(head, body, "Request Table", fields = fields, \
                             onClick = 'detail_request')
-            self.endTask()
         except Exception,e:
             for i in apply(traceback.format_exception, sys.exc_info()):
                 print i
@@ -333,8 +331,8 @@ class ApiWsdl:
 
             cl_req_id = str(dv.Get('cl_req_id'))
             cl_req_group = str(dv.Get('cl_req_group'))
-            self.startTask('Confirm Request')
-            
+            #self.startTask('Confirm Request')
+            self.printSUCCESS ('<b>'+_('Confirm Request')+'</b>')
             self.printSUCCESS ("cl_req_id = %s" %cl_req_id)
             self.printSUCCESS ("cl_req_group = %s" %cl_req_group)
             
@@ -374,8 +372,9 @@ class ApiWsdl:
             p = subprocess.Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE,
             stderr=subprocess.STDOUT, close_fds=True)
             p.wait()
-            self.printSUCCESS (_("certificate %s is signed") %cl_cert)
-            self.endTask()
+            self.printSUCCESS ('<b>' + _("certificate %s is signed") %cl_cert \
+                               + '</b>')
+            #self.endTask()
             return True
         except (KeyboardInterrupt,):
             self.printERROR('Process is interrupted!')

api/server/test.py

@@ -129,12 +129,7 @@ class ApiWsdl:
         except KeyboardInterrupt:
             try:
                 # Необходимо передать Fasle для сохранения данных о процессе
-                f = True
-                while f:
-                    print 'save'
-                    time.sleep(3)
-                    print "OKOKOK"
-                    f = False
+                self.printERROR(_('Interrupted by user'))
                 return False
             except KeyboardInterrupt:
                 return False
@@ -280,6 +275,7 @@ class ApiWsdl:
                     label = _("select ISO"),
                     default = '/var/calculate',
                     choice = ['first', 'second'],
+                    choice = ['first', 'second'],
                     value = 'Python files (*.py, *.pyc)',
                     type = 'files',
                     opt = Option(longopt="--times",