Changeset 108917 in webkit


Ignore:
Timestamp:
Feb 25, 2012 5:22:39 PM (12 years ago)
Author:
rniwa@webkit.org
Message:

perf-o-matic needs a better admin page
​https://bugs.webkit.org/show_bug.cgi?id=79585

Reviewed by Sam Weinig.

Add admin/ to replace admin/create-models.html and admin/merge-tests.

Also update MergeTestHandler to accept JSON requests and add "Admin" navigation link on all pages.

  • Websites/webkit-perf.appspot.com/admin_handlers.py: Added.
  • Websites/webkit-perf.appspot.com/controller.py:

(RunsUpdateHandler.post): Fix a regression from r108399.

  • Websites/webkit-perf.appspot.com/css/admin.css: Added.
  • Websites/webkit-perf.appspot.com/js/admin.js: Added.
  • Websites/webkit-perf.appspot.com/js/config.js:
  • Websites/webkit-perf.appspot.com/main.py:
  • Websites/webkit-perf.appspot.com/merge_tests.html: Removed.
  • Websites/webkit-perf.appspot.com/merge_tests_handler.py:

(MergeTestsHandler):
(MergeTestsHandler.post):

  • Websites/webkit-perf.appspot.com/static: Removed.
  • Websites/webkit-perf.appspot.com/static/create-models.html: Removed.
Location:
trunk
Files:
3 added
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r108845 r108917  
     12012-02-25  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        perf-o-matic needs a better admin page
     4        https://bugs.webkit.org/show_bug.cgi?id=79585
     5
     6        Reviewed by Sam Weinig.
     7       
     8        Add admin/ to replace admin/create-models.html and admin/merge-tests.
     9
     10        Also update MergeTestHandler to accept JSON requests and add "Admin" navigation link on all pages.
     11
     12        * Websites/webkit-perf.appspot.com/admin_handlers.py: Added.
     13        * Websites/webkit-perf.appspot.com/controller.py:
     14        (RunsUpdateHandler.post): Fix a regression from r108399.
     15        * Websites/webkit-perf.appspot.com/css/admin.css: Added.
     16        * Websites/webkit-perf.appspot.com/js/admin.js: Added.
     17        * Websites/webkit-perf.appspot.com/js/config.js:
     18        * Websites/webkit-perf.appspot.com/main.py:
     19        * Websites/webkit-perf.appspot.com/merge_tests.html: Removed.
     20        * Websites/webkit-perf.appspot.com/merge_tests_handler.py:
     21        (MergeTestsHandler):
     22        (MergeTestsHandler.post):
     23        * Websites/webkit-perf.appspot.com/static: Removed.
     24        * Websites/webkit-perf.appspot.com/static/create-models.html: Removed.
     25
    1262012-02-24  Ryosuke Niwa  <rniwa@webkit.org>
    227

  • trunk/Websites/webkit-perf.appspot.com/controller.py

    r108399 r108917  
    115115        self.post()
    116116
    117     def get(self):
     117    def post(self):
    118118        self.response.headers['Content-Type'] = 'text/plain; charset=utf-8'
    119119        test_id, branch_id, platform_id = _get_test_branch_platform_ids(self)

  • trunk/Websites/webkit-perf.appspot.com/js/config.js

    r108189 r108917  
    100100    });
    101101}
     102
     103(function() {
     104    $.ajaxSetup({
     105        'error': function(xhr, e, message) {
     106            error('Could not determine the the login status', e);
     107        },
     108        cache: true,
     109    });
     110
     111    $.getJSON('/api/user/is-admin', function (isAdmin) {
     112        if (isAdmin) {
     113            $('#header nav').append('<a href="/admin/">Admin</a>');
     114            if (!$('#header nav .selected').length) {
     115                $('#header nav a').last().addClass('selected')
     116            }
     117        }
     118    })
     119})();

  • trunk/Websites/webkit-perf.appspot.com/main.py

    r108399 r108917  
    2121import json
    2222
     23from admin_handlers import IsAdminHandler
     24from admin_handlers import AdminDashboardHandler
    2325from controller import CachedDashboardHandler
    2426from controller import CachedManifestHandler
    … …  
    3941    ('/admin/report-logs/?', ReportLogsHandler),
    4042    ('/admin/create/(.*)', CreateHandler),
     43    (r'/admin/([A-Za-z\-]*)', AdminDashboardHandler),
     44    ('/api/user/is-admin', IsAdminHandler),
    4145    ('/api/test/?', CachedManifestHandler),
    4246    ('/api/test/update', ManifestUpdateHandler),

  • trunk/Websites/webkit-perf.appspot.com/merge_tests_handler.py

    r107393 r108917  
    3131from google.appengine.ext.webapp import template
    3232
     33import json
    3334import os
    3435
    … …  
    4243
    4344class MergeTestsHandler(webapp2.RequestHandler):
    44     def get(self):
    45         self.response.out.write(template.render('merge_tests.html', {'tests': Test.all()}))
    46 
    4745    def post(self):
    4846        self.response.headers['Content-Type'] = 'text/plain; charset=utf-8';
    4947
    50         merge = Test.get_by_key_name(self.request.get('merge'))
    51         into = Test.get_by_key_name(self.request.get('into'))
     48        try:
     49            payload = json.loads(self.request.body)
     50            merge = payload.get('merge', '')
     51            into = payload.get('into', '')
     52        except:
     53            self.response.out.write("Failed to parse the payload: %s" % self.request.body)
     54            return
     55
     56        merge = Test.get_by_key_name(merge)
     57        into = Test.get_by_key_name(into)
    5258        if not merge or not into:
    5359            self.response.out.write('Invalid test names')
Note: See TracChangeset for help on using the changeset viewer.