kritbit Commit Details

Date:

2015-11-22 10:58:53 (9 years 11 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

8a032e1f54dbdb4c9b9d5e35ab0a647beb25ed65

Parents:

a1222a55ee727e2dade12ed74eee1d89d9be6362

Message:

Adding status css on success runs Fixing runcommand

Changes:

File differences

-106
107 107
108 108
109 
109
110 110
111 111
112 112
+nonce = ''.join(random.SystemRandom().choice(string.hexdigits + string.digits) for _ in range(10))␊
message = {}␊
message["nonce"] = nonce␊
message["message"] = json.dumps({"output":out, "time_taken": total, "result": 1})␊
message["message"] = json.dumps({"output":out, "time_taken": total, "result": exitcode})␊
message["signature"] = hashlib.sha256(message["message"] + nonce + HASH).hexdigest()␊
message["message"] = encrypt(SHARED_KEY, message["message"])␊
print curl_post(URL, {"data": json.dumps(message)}).getvalue()
 nonce = ''.join(random.SystemRandom().choice(string.hexdigits + string.digits) for _ in range(10))␊
 message = {}␊
 message["nonce"] = nonce␊
-message["message"] = json.dumps({"output":out, "time_taken": total, "result": 1})␊
+message["message"] = json.dumps({"output":out, "time_taken": total, "result": exitcode})␊
 message["signature"] = hashlib.sha256(message["message"] + nonce + HASH).hexdigest()␊
 message["message"] = encrypt(SHARED_KEY, message["message"])␊
 print curl_post(URL, {"data": json.dumps(message)}).getvalue()

-7
8 8
9 9
10 
10
11 11
12
13
14
15
16
17
18
19
20
21
22
23
12 24
+    public $jobs_id;␊
    public $run_date;␊
    public $time_taken;␊
    public $result;␊
    public $result = null;␊
    public $nonce;␊
␊
␉public $h2o_safe = true;␊
␊
␉public function getTRClass() {␊
␉␉if ($this->result == null) {␊
␉␉␉return "";␊
␉␉} elseif ($this->result == 0) {␊
␉␉␉return "success";␊
␉␉} else {␊
␉␉␉return "danger";␊
␉␉}␊
␉}␊
}
     public $jobs_id;␊
     public $run_date;␊
     public $time_taken;␊
-    public $result;␊
+    public $result = null;␊
     public $nonce;␊
+␊
+␉public $h2o_safe = true;␊
+␊
+␉public function getTRClass() {␊
+␉␉if ($this->result == null) {␊
+␉␉␉return "";␊
+␉␉} elseif ($this->result == 0) {␊
+␉␉␉return "success";␊
+␉␉} else {␊
+␉␉␉return "danger";␊
+␉␉}␊
+␉}␊
 }

-9
10 10
11 11
12 
12
13 13
14 14
15 15
... ...
39 39
40 40
41 41
42
43
44
45
46
47
48
49
50
51
42 52
+    public $cron;␊
    public $failScript;␊
    public $last_run;␊
    public $last_result;␊
    public $last_result = null;␊
    public $user_id;␊
    public $hash;␊
    public $sharedkey;␊

        }␊
␊
    }␊
␊
␉public function getTRClass() {␊
␉␉if ($this->last_run == "" || $this->last_result == null) {␊
␉␉␉return "";␊
␉␉} elseif ($this->last_result == 0) {␊
␉␉␉return "success";␊
␉␉} else {␊
␉␉␉return "danger";␊
␉␉}␊
␉}␊
}
 ...
     public $cron;␊
     public $failScript;␊
     public $last_run;␊
-    public $last_result;␊
+    public $last_result = null;␊
     public $user_id;␊
     public $hash;␊
     public $sharedkey;␊
         }␊
 ␊
     }␊
+␊
+␉public function getTRClass() {␊
+␉␉if ($this->last_run == "" || $this->last_result == null) {␊
+␉␉␉return "";␊
+␉␉} elseif ($this->last_result == 0) {␊
+␉␉␉return "success";␊
+␉␉} else {␊
+␉␉␉return "danger";␊
+␉␉}␊
+␉}␊
 }

-47
48 48
49 49
50 
51 
52 
53 
54 
50
55 51
56 52
57 53
+        </tr>␊
        {% endif %}␊
        {% for history in histories %}␊
        {% if history.result != 0 %}␊
        <tr class="danger">␊
        {% else %}␊
        <tr>␊
        {% endif %}␊
        <tr class="{{history.getTRClass}}">␊
            <td><a class="btn btn-default" href="/history/log/{{job.id}}/{{history.id}}/" role="button">View</a></td>␊
            <td>{{history.run_date}}</td>␊
            <td>{{history.time_taken}}</td>␊
         </tr>␊
         {% endif %}␊
         {% for history in histories %}␊
-        {% if history.result != 0 %}␊
-        <tr class="danger">␊
-        {% else %}␊
-        <tr>␊
-        {% endif %}␊
+        <tr class="{{history.getTRClass}}">␊
             <td><a class="btn btn-default" href="/history/log/{{job.id}}/{{history.id}}/" role="button">View</a></td>␊
             <td>{{history.run_date}}</td>␊
             <td>{{history.time_taken}}</td>␊

-22
23 23
24 24
25 
26 
27 
28 
29 
25
30 26
31 27
32 28
+    </thead>␊
    <tbody>␊
    {% for job in jobs %}␊
    {% if job.last_result != 0 %}␊
        <tr class="danger">␊
    {% else %}␊
        <tr>␊
    {% endif %}␊
        <tr class="{{job.getTRClass}}">␊
            <td><a class="btn btn-default" href="/job/edit/{{job.id}}" role="button">Edit</a></td>␊
            <td>{{job.jobName}}</td>␊
            <td>{{job.getRunType}}</td>␊
     </thead>␊
     <tbody>␊
     {% for job in jobs %}␊
-    {% if job.last_result != 0 %}␊
-        <tr class="danger">␊
-    {% else %}␊
-        <tr>␊
-    {% endif %}␊
+        <tr class="{{job.getTRClass}}">␊
             <td><a class="btn btn-default" href="/job/edit/{{job.id}}" role="button">Edit</a></td>␊
             <td>{{job.jobName}}</td>␊
             <td>{{job.getRunType}}</td>␊