Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit ac28b5c
Merge: 3e5ec8c c81b8e0
Author: ticoann <[email protected]>
Date:   Tue Dec 30 10:19:54 2014 -0600

    Merge pull request dmwm#5549 from ticoann/reqmgr2

    dashboard -> Dashboard in spec param

commit c81b8e0
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 30 10:18:13 2014 -0600

    dashboard -> Dashboard in spec param

commit 3e5ec8c
Merge: 3c669c2 2595bd7
Author: ticoann <[email protected]>
Date:   Tue Dec 30 09:56:38 2014 -0600

    Merge pull request dmwm#5548 from ticoann/reqmgr2

    Reqmgr2

commit 2595bd7
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 30 09:54:02 2014 -0600

     change maxRSS -> MaxRSS, maxVSize -> MaxVSize, dashboard -> Dashboard in the spec definition

commit 50bc21e
Merge: 3c669c2 949e873
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 30 09:35:27 2014 -0600

    Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2

    Conflicts:
    	CHANGES

commit 3c669c2
Merge: d3ee889 4dbbe74
Author: ticoann <[email protected]>
Date:   Tue Dec 30 09:27:37 2014 -0600

    Merge pull request dmwm#5547 from ticoann/reqmgr2

    Reqmgr2

commit 4dbbe74
Merge: d3ee889 619b162
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 30 09:25:59 2014 -0600

    Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2

commit d3ee889
Merge: 6e399e1 7d406b2
Author: ticoann <[email protected]>
Date:   Mon Dec 29 15:03:31 2014 -0600

    Merge pull request dmwm#5546 from ticoann/reqmgr2

    initial update for the data cache

commit 7d406b2
Author: Seangchan Ryu <[email protected]>
Date:   Mon Dec 29 15:00:01 2014 -0600

    initial update for the data cache

commit 6e399e1
Merge: 0d7afc4 a2929f5
Author: ticoann <[email protected]>
Date:   Fri Dec 26 14:48:17 2014 -0600

    Merge pull request dmwm#5545 from ticoann/reqmgr2

    record dn for every status change

commit a2929f5
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 26 14:46:39 2014 -0600

    record dn for every status change

commit 0d7afc4
Merge: 0e55cbd 985b204
Author: ticoann <[email protected]>
Date:   Fri Dec 26 14:16:10 2014 -0600

    Merge pull request dmwm#5544 from ticoann/reqmgr2

    Reqmgr2

commit 985b204
Merge: 0e55cbd d7ab8ff
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 26 14:14:52 2014 -0600

    Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2

    Conflicts:
    	CHANGES

commit 0e55cbd
Merge: d225ab5 11211c0
Author: ticoann <[email protected]>
Date:   Fri Dec 26 14:11:54 2014 -0600

    Merge pull request dmwm#5543 from ticoann/reqmgr2

    add assign_optional property

commit 11211c0
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 26 14:10:25 2014 -0600

    add assign_optional property

commit d225ab5
Merge: f383307 3ed524a
Author: ticoann <[email protected]>
Date:   Fri Dec 26 11:58:24 2014 -0600

    Merge pull request dmwm#5542 from ticoann/reqmgr2

    convert type when validation happen

commit 3ed524a
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 26 11:57:11 2014 -0600

    convert type when validation happen

commit f383307
Merge: eb2a0f6 e861874
Author: ticoann <[email protected]>
Date:   Fri Dec 26 10:36:31 2014 -0600

    Merge pull request dmwm#5541 from ticoann/reqmgr2

    convert possible content to pass the validation

commit e861874
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 26 10:33:14 2014 -0600

    convert possible content to pass the validation

commit eb2a0f6
Merge: 1b94cb8 122accf
Author: ticoann <[email protected]>
Date:   Tue Dec 23 14:07:32 2014 -0600

    Merge pull request dmwm#5540 from vkuznet/reqmgr2

    Remove cust_sites/non_cust_sites/auto_approve_sites

commit 122accf
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 23 15:02:27 2014 -0500

    Remove cust_sites/non_cust_sites/auto_approve_sites; no defaults in assign template for them; add condtitions to template for them

commit 1b94cb8
Merge: 883e6ca c18e310
Author: ticoann <[email protected]>
Date:   Tue Dec 23 13:25:25 2014 -0600

    Merge pull request dmwm#5539 from ticoann/reqmgr2

    add Validation code

commit c18e310
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 23 13:24:05 2014 -0600

    add Validation code

commit 883e6ca
Merge: aba0a03 a33e3f6
Author: ticoann <[email protected]>
Date:   Tue Dec 23 08:20:28 2014 -0600

    Merge pull request dmwm#5538 from ticoann/reqmgr2

    change to use REST directly

commit a33e3f6
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 23 03:11:40 2014 -0600

    change to use REST directly

commit aba0a03
Merge: 9da18ac c7ffd58
Author: ticoann <[email protected]>
Date:   Fri Dec 19 16:16:27 2014 -0600

    Merge pull request dmwm#5537 from ticoann/reqmgr2

    Reqmgr2

commit c7ffd58
Merge: 67d8f6b 9da18ac
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 19 16:09:49 2014 -0600

    Merge branch 'reqmgr2' of https://github.com/dmwm/WMCore into reqmgr2

    Conflicts:
    	src/python/WMCore/ReqMgr/Web/ReqMgrService.py

commit 67d8f6b
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 19 16:00:34 2014 -0600

    fix status

commit 92e187f
Author: Seangchan Ryu <[email protected]>
Date:   Fri Dec 19 15:58:23 2014 -0600

    fix put and get request

commit 9da18ac
Merge: c5cfbad bf55a31
Author: ticoann <[email protected]>
Date:   Fri Dec 19 15:57:35 2014 -0600

    Merge pull request dmwm#5536 from vkuznet/reqmgr2

    Changes for assign interface

commit bf55a31
Author: Valentin Kuznetsov <[email protected]>
Date:   Fri Dec 19 13:59:50 2014 -0500

    use RequestStatus

commit db23be8
Author: Valentin Kuznetsov <[email protected]>
Date:   Fri Dec 19 10:46:31 2014 -0500

    Exclude status from kwds when pass them to updateRequestProperty and add separate call to update request status

commit 1809493
Author: Valentin Kuznetsov <[email protected]>
Date:   Fri Dec 19 10:45:38 2014 -0500

    Remove Name input tag and comment out dashboard activity since they're not validated in ReqMgr code

commit c5cfbad
Merge: cf91fd4 e933810
Author: ticoann <[email protected]>
Date:   Thu Dec 18 09:18:47 2014 -0600

    Merge pull request dmwm#5533 from vkuznet/reqmgr2

    Support response status notifications

commit e933810
Author: Valentin Kuznetsov <[email protected]>
Date:   Thu Dec 18 10:07:16 2014 -0500

    Update status once request dict is updated

commit b22ae43
Author: Valentin Kuznetsov <[email protected]>
Date:   Thu Dec 18 10:02:32 2014 -0500

    Define response status for ajax callback function

commit 44e610a
Author: Valentin Kuznetsov <[email protected]>
Date:   Thu Dec 18 10:02:09 2014 -0500

    Refactor code to support responses and provide proper notification based on response status

commit cf91fd4
Merge: 9b4d5e2 2989253
Author: ticoann <[email protected]>
Date:   Wed Dec 17 15:58:54 2014 -0600

    Merge pull request dmwm#5532 from vkuznet/reqmgr2

    Cosmetic changes with styles

commit 2989253
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:45:27 2014 -0500

    Add printout for status (temp)

commit 6fa8e5b
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:41:55 2014 -0500

    wrap content into placeholder where we can apply styles

commit 000ad2f
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:41:34 2014 -0500

    use small buttons

commit f186414
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:41:30 2014 -0500

    use small buttons

commit 6976676
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:41:27 2014 -0500

    use small buttons

commit 286419e
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:41:21 2014 -0500

    use small buttons

commit 82b292c
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 16:40:50 2014 -0500

    New font for body

commit 9b4d5e2
Merge: 18614a1 4e8b05d
Author: ticoann <[email protected]>
Date:   Wed Dec 17 11:27:37 2014 -0600

    Merge pull request dmwm#5531 from vkuznet/reqmgr2

    Add confirmation for actions, new kube css library

commit 4e8b05d
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:24:36 2014 -0500

    Remove old kube library

commit d14184a
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:23:47 2014 -0500

    New version of kube library

commit 372a99f
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:23:30 2014 -0500

    Clean-up

commit d7d0f7d
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:23:19 2014 -0500

    Clean-up

commit add3f03
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:23:08 2014 -0500

    Add confirmation placeholder

commit 4b51bb3
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:22:52 2014 -0500

    Add confirmation CSS

commit 8a19941
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 12:22:32 2014 -0500

    Expand ajax action to provide users with confirmation

commit 18614a1
Merge: 0e33022 edaab32
Author: ticoann <[email protected]>
Date:   Wed Dec 17 10:36:09 2014 -0600

    Merge pull request dmwm#5530 from vkuznet/reqmgr2

    Patches to use ajax instead of forms in approve/assign interfaces

commit edaab32
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 11:13:30 2014 -0500

    Load settings from config (e.g. dbs_url, etc); remove obsolete code and JSON example since create interface works now

commit d4c5c25
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 09:35:25 2014 -0500

    Remove scripts method; load script in create action

commit 8ba20ad
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 09:34:33 2014 -0500

    Remove ajaxScript since it is obsolete now

commit dbb0715
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 17 09:34:13 2014 -0500

    Extend code to parse json data

commit 5fd37a6
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 20:54:14 2014 -0500

    Add create handler in ajax_action (need to be tested)

commit ea96a6d
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 20:53:42 2014 -0500

    Convert to ajax form

commit 7c81b46
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 20:53:25 2014 -0500

    Fix JS bug

commit 54d3ec7
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 20:53:09 2014 -0500

    Fix comments

commit bd4b14a
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 20:52:53 2014 -0500

    Fix option input tag bug

commit 3256c26
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 14:58:37 2014 -0500

    Added reject buttons; change templates to use ajax function instead of forms

commit 986003d
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 14:58:03 2014 -0500

    Change ajax_approve into generic ajax_action

commit f08b2b5
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 14:57:26 2014 -0500

    New version of ajaxRequest function

commit 9cb9025
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 14:57:05 2014 -0500

    New version of the library

commit 0e33022
Merge: 35a0853 dbb734b
Author: ticoann <[email protected]>
Date:   Tue Dec 16 10:25:11 2014 -0600

    Merge pull request dmwm#5529 from vkuznet/reqmgr2

    web UI polishing

commit dbb734b
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 11:13:26 2014 -0500

    Use placeholder for inputs which requires changes

commit db1e61c
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 11:13:02 2014 -0500

    Add placeholder styles

commit 35a0853
Merge: bf1f3ad 3e40d08
Author: ticoann <[email protected]>
Date:   Tue Dec 16 09:46:18 2014 -0600

    Merge pull request dmwm#5528 from vkuznet/reqmgr2

    Reqmgr2 create template changes

commit 3e40d08
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 10:42:02 2014 -0500

    Adjust templates to satisfy spec requirements

commit 7a5a68c
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 16 10:41:39 2014 -0500

    Add check for types of JSON templates; add acdc urls for templates

commit 43e47e3
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 19:18:30 2014 -0500

    Add appropriate css classes to input tag forms

commit a1620a6
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 19:17:58 2014 -0500

    Add replace css

commit a6b7571
Author: Valentin <[email protected]>
Date:   Mon Dec 15 22:24:32 2014 +0100

    Rename template to follow new naming conventions

commit f2fc8a0
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 16:19:36 2014 -0500

    Read specs and use them for verification

commit 62985c1
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 16:19:07 2014 -0500

    New new naming convention

commit 35d93fd
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 16:18:50 2014 -0500

    New helper function to get couch url, should read it elsewhere

commit 4e08ab4
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 16:18:16 2014 -0500

    New naming convention

commit bf1f3ad
Merge: 55dddac 708b0f3
Author: ticoann <[email protected]>
Date:   Mon Dec 15 11:57:25 2014 -0600

    Merge pull request dmwm#5527 from ticoann/reqmgr2

    clean up state transition

commit 708b0f3
Author: Seangchan Ryu <[email protected]>
Date:   Mon Dec 15 11:56:19 2014 -0600

    clean up state transition

commit 55dddac
Merge: 871a6e9 b2d3f3b
Author: ticoann <[email protected]>
Date:   Mon Dec 15 09:47:56 2014 -0600

    Merge pull request dmwm#5523 from ticoann/reqmgr2

    Intermediate change to server call

commit 871a6e9
Merge: e2e427e bd1d27a
Author: ticoann <[email protected]>
Date:   Mon Dec 15 09:47:11 2014 -0600

    Merge pull request dmwm#5526 from vkuznet/reqmgr2

    New changes for create action

commit b2d3f3b
Author: Seangchan Ryu <[email protected]>
Date:   Thu Dec 11 11:34:28 2014 -0600

    Intermediate change to server call

commit bd1d27a
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 10:39:21 2014 -0500

    Fix statuses and work on creation action; add dbs_url, cc_url, cc_id into create template

commit aea9583
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 10:38:35 2014 -0500

    Adjust to proper structure

commit 23199fe
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 10:38:18 2014 -0500

    Replace empty list w/ input text

commit 1eeeefb
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 15 10:37:55 2014 -0500

    Fix typo

commit e2e427e
Merge: 0b0aa56 d4d2abe
Author: ticoann <[email protected]>
Date:   Wed Dec 10 15:35:59 2014 -0600

    Merge pull request dmwm#5521 from vkuznet/reqmgr2

    Re-factor code to use validated python scripts

commit d4d2abe
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 10 14:43:55 2014 -0600

    Re-factor code to now use snippets and load python scripts in create action

commit 0b0aa56
Merge: ce65921 329cd30
Author: ticoann <[email protected]>
Date:   Wed Dec 10 12:56:25 2014 -0600

    Merge pull request dmwm#5520 from ticoann/reqmgr2

    Reqmgr2

commit 329cd30
Merge: da1d91c 6b7122f
Author: Seangchan Ryu <[email protected]>
Date:   Wed Dec 10 12:55:11 2014 -0600

    Merge remote-tracking branch 'upstream/master' into reqmgr2

commit da1d91c
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 10 09:46:41 2014 -0600

    Bug fix

commit 71852ac
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 10 09:42:40 2014 -0600

    Fix location of jsdir

commit ce65921
Merge: d291a88 0cca2a9
Author: ticoann <[email protected]>
Date:   Wed Dec 10 09:51:10 2014 -0600

    Merge pull request dmwm#5519 from vkuznet/reqmgr2

    Fix location of jsdir

commit 0cca2a9
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 10 09:46:41 2014 -0600

    Bug fix

commit 9fdb842
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 10 09:42:40 2014 -0600

    Fix location of jsdir

commit d291a88
Merge: 2694f9b 6183046
Author: ticoann <[email protected]>
Date:   Tue Dec 9 22:50:27 2014 -0600

    Merge pull request dmwm#5517 from ticoann/reqmgr2

    Reqmgr2

commit 6183046
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 9 15:12:05 2014 -0600

    add temp validation error message

commit d8183d2
Merge: b5b8d97 b5b21a0
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 9 15:11:09 2014 -0600

    Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2

    Conflicts:
    	CHANGES
    	src/python/WMCore/JobSplitting/Harvest.py
    	src/python/WMCore/__init__.py

commit 2694f9b
Merge: 21b8cdb 31e7ddd
Author: ticoann <[email protected]>
Date:   Tue Dec 9 14:37:03 2014 -0600

    Merge pull request dmwm#5515 from vkuznet/reqmgr2

    Changes for testing web UI with actual reqmgr2 server

commit 31e7ddd
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 9 14:30:33 2014 -0600

    Remove yui; replace reqmgr_db.document with getRequestByNames; turn on new reqmgr2 APIs; use example doc for testing the injection

commit 21b8cdb
Merge: 3c2a4ba b5b8d97
Author: ticoann <[email protected]>
Date:   Wed Dec 3 09:53:04 2014 -0600

    Merge pull request dmwm#5503 from ticoann/reqmgr2

    add comments

commit b5b8d97
Author: Seangchan Ryu <[email protected]>
Date:   Wed Dec 3 09:51:50 2014 -0600

    add comments

commit 3c2a4ba
Merge: 17c1f67 179e0c5
Author: ticoann <[email protected]>
Date:   Wed Dec 3 09:23:32 2014 -0600

    Merge pull request dmwm#5502 from vkuznet/reqmgr2

    Add sort capability

commit 179e0c5
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 3 09:23:59 2014 -0500

    Change updateRequestStatus to updateRequestProperty in assign method

commit ce398c7
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Dec 3 09:15:51 2014 -0500

    Add sort capability

commit 17c1f67
Merge: b1ef8f4 fd9db61
Author: ticoann <[email protected]>
Date:   Tue Dec 2 14:38:50 2014 -0600

    Merge pull request dmwm#5500 from vkuznet/reqmgr2

    Adjust create/assign/approve to new reqmgr2 APIs

commit fd9db61
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 2 14:00:57 2014 -0500

    Adjust web UI new to new reqmgr2 APIs

commit c66acff
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 2 14:00:21 2014 -0500

    Display status

commit 4cfeed1
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Dec 2 13:59:56 2014 -0500

    Change method since we may pass quite a lot of ids

commit b1ef8f4
Merge: 4d77c77 741ef2b
Author: ticoann <[email protected]>
Date:   Tue Dec 2 12:04:47 2014 -0600

    Merge pull request dmwm#5499 from ticoann/reqmgr2

    Reqmgr2

commit 741ef2b
Author: Seangchan Ryu <[email protected]>
Date:   Sun Nov 30 10:37:19 2014 -0600

    1.0.2.pre1

    Signed-off-by: Seangchan Ryu <[email protected]>

commit 7d36707
Author: Seangchan Ryu <[email protected]>
Date:   Sun Nov 30 10:10:35 2014 -0600

    add lumilist in schema in str format

commit 11fb295
Author: Seangchan Ryu <[email protected]>
Date:   Wed Nov 12 11:16:48 2014 -0600

    Add multi run harvesting

commit 8f1ffce
Author: Seangchan Ryu <[email protected]>
Date:   Mon Nov 17 15:01:24 2014 -0600

    patch for setting prep ids per task in task chain

commit 4ec03d9
Author: Seangchan Ryu <[email protected]>
Date:   Fri Nov 28 22:38:52 2014 -0600

    move the dbs import statement within the function since this package is imported in Runtime.
    DBS client is not in the sandbox.

commit 5a1a79b
Author: Alan <[email protected]>
Date:   Fri Nov 21 13:59:44 2014 +0100

    new json template for RelVal multi-run harvesting

    remove multicore parameter

    fix DQMConfigCacheID

commit c0e5e12
Author: Eric Vaandering <[email protected]>
Date:   Fri Nov 21 13:36:28 2014 -0600

    Also fetch McM data if total events is defined and approval time is not

commit d6f36c4
Author: Seangchan Ryu <[email protected]>
Date:   Tue Dec 2 11:52:45 2014 -0600

    fix format

    add comments

commit e0ebe08
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 13:47:07 2014 -0500

    Added sort functionality into approve interface

commit 4de6bcc
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 13:46:15 2014 -0500

    Replace menu with URL calls

commit d49e637
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 13:45:46 2014 -0500

    Add web codes and throw URLError; added sort helper function

commit 4d77c77
Merge: ba943af 1abda41
Author: ticoann <[email protected]>
Date:   Mon Dec 1 14:02:35 2014 -0600

    Merge pull request dmwm#5498 from vkuznet/reqmgr2

    Work on approve/assign interfaces, added sort into approve

commit 1abda41
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 13:47:07 2014 -0500

    Added sort functionality into approve interface

commit 8c32e10
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 13:46:15 2014 -0500

    Replace menu with URL calls

commit 3d91b0a
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 13:45:46 2014 -0500

    Add web codes and throw URLError; added sort helper function

commit ba943af
Merge: 6829f22 f9fbc79
Author: ticoann <[email protected]>
Date:   Mon Dec 1 10:16:10 2014 -0600

    Merge pull request dmwm#5497 from vkuznet/reqmgr2

    Changes to use new reqmgr2 APIs

commit f9fbc79
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 10:56:12 2014 -0500

    Change assignment-approved status

commit 780e466
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Dec 1 10:04:23 2014 -0500

    New reqmgr2 APIs

commit 6829f22
Merge: 3bc739a 9944aaa
Author: ticoann <[email protected]>
Date:   Wed Nov 26 15:40:54 2014 -0600

    Merge pull request dmwm#5490 from ticoann/reqmgr2

    fixed cache for Service.py

commit 9944aaa
Author: Seangchan Ryu <[email protected]>
Date:   Wed Nov 26 14:12:57 2014 -0600

    fixed cache

commit 3bc739a
Merge: 5bb30b4 0be14c5
Author: ticoann <[email protected]>
Date:   Wed Nov 26 12:56:29 2014 -0600

    Merge pull request dmwm#5489 from vkuznet/reqmgr2

    Reqmgr2

commit 0be14c5
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Nov 26 10:16:31 2014 -0500

    Remove extra line

commit ef88557
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Nov 26 10:12:15 2014 -0500

    Remove conflict statements

commit 0701ccd
Merge: ecf0bfb aa6a071
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Nov 26 10:05:39 2014 -0500

    Merge branch 'reqmgr2' of github.com:vkuznet/WMCore into reqmgr2

commit ecf0bfb
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Jun 24 11:29:25 2014 -0400

    New code for ReqMgr web UI including changes for underlying WMCore

commit 4645706
Author: Seangchan Ryu <[email protected]>
Date:   Fri Aug 23 13:37:23 2013 -0500

    Squashed commit of the following:

    commit fdeacde
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Aug 23 13:34:11 2013 -0500

        add clone test and fix assignment permission

    commit cc187d0
    Merge: 4468319 b356e27
    Author: Seangchan Ryu <[email protected]>
    Date:   Mon Aug 19 11:29:50 2013 -0500

        reqmgr rest api - work in progress
        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

        Conflicts:
        	src/python/WMCore/WMSpec/StdSpecs/StdBase.py

    commit 4468319
    Author: Seangchan Ryu <[email protected]>
    Date:   Wed Aug 7 11:19:38 2013 -0500

        add validation for assignment - workin progress

    commit 957e6a3
    Merge: 6518f43 0923ed4
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:41:03 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

    commit 6518f43
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:39:30 2013 -0500

        validation work in progress

    commit e010744
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 12:01:18 2013 -0500

        initial argument update validation

    commit 3f0aa75
    Merge: 7d6a00d f7a5f8e
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:47:18 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2_rest_7_3

        Conflicts:
        	src/python/WMCore/ReqMgr/Service/Request.py
        	test/python/WMCore_t/ReqMgr_t/Service_t/ReqMgr_t.py

    commit 7d6a00d
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:19:17 2013 -0500

        remove aux.json

commit 7fe07f6
Author: Seangchan Ryu <[email protected]>
Date:   Fri Aug 23 13:37:23 2013 -0500

    Squashed commit of the following:

    commit fdeacde
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Aug 23 13:34:11 2013 -0500

        add clone test and fix assignment permission

    commit cc187d0
    Merge: 4468319 b356e27
    Author: Seangchan Ryu <[email protected]>
    Date:   Mon Aug 19 11:29:50 2013 -0500

        reqmgr rest api - work in progress
        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

        Conflicts:
        	src/python/WMCore/WMSpec/StdSpecs/StdBase.py

    commit 4468319
    Author: Seangchan Ryu <[email protected]>
    Date:   Wed Aug 7 11:19:38 2013 -0500

        add validation for assignment - workin progress

    commit 957e6a3
    Merge: 6518f43 0923ed4
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:41:03 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

    commit 6518f43
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:39:30 2013 -0500

        validation work in progress

    commit e010744
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 12:01:18 2013 -0500

        initial argument update validation

    commit 3f0aa75
    Merge: 7d6a00d f7a5f8e
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:47:18 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2_rest_7_3

        Conflicts:
        	src/python/WMCore/ReqMgr/Service/Request.py
        	test/python/WMCore_t/ReqMgr_t/Service_t/ReqMgr_t.py

    commit 7d6a00d
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:19:17 2013 -0500

        remove aux.json

commit 34b7294
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 12:00:18 2014 -0500

    Comment out authz_fake

commit 9845ca5
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:38 2014 -0500

    Comment out printouts

commit 6c028c2
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:08 2014 -0500

    Add activate actions for user/team managers

commit 92b4f28
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:46 2014 -0400

    Chnage default threshold for reload

commit 18a0808
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:09 2014 -0400

    Add update_scripts method to automatically update scripts re-loading from its area

commit d583a81
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:02:18 2014 -0400

    Add scripts API to look-up script name

commit 6c68fc1
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:36 2014 -0400

    Use ajaxScript to update code snippet textarea

commit fa2158e
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:12 2014 -0400

    Add ajaxScript function to look-up code snippet

commit 3dd8320
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Aug 25 11:13:02 2014 -0400

    Add prototype how to select existing python snippets, TODO: create repository python snippets and pass dict with them to template

commit 5bb30b4
Merge: bec4f9a 3c36646
Author: ticoann <[email protected]>
Date:   Tue Nov 25 14:32:04 2014 -0600

    Merge pull request dmwm#5488 from ticoann/reqmgr2

    Reqmgr2

commit 3c36646
Author: Seangchan Ryu <[email protected]>
Date:   Tue Nov 25 14:30:44 2014 -0600

    add reqmgr2 python client

commit aa6a071
Merge: c0474fb 76e361c
Author: Valentin Kuznetsov <[email protected]>
Date:   Sun Nov 23 08:45:29 2014 -0500

    Add setup dependencies

commit c0474fb
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Jun 24 11:29:25 2014 -0400

    New code for ReqMgr web UI including changes for underlying WMCore

commit 2e8f6d7
Author: Seangchan Ryu <[email protected]>
Date:   Fri Aug 23 13:37:23 2013 -0500

    Squashed commit of the following:

    commit fdeacde
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Aug 23 13:34:11 2013 -0500

        add clone test and fix assignment permission

    commit cc187d0
    Merge: 4468319 b356e27
    Author: Seangchan Ryu <[email protected]>
    Date:   Mon Aug 19 11:29:50 2013 -0500

        reqmgr rest api - work in progress
        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

        Conflicts:
        	src/python/WMCore/WMSpec/StdSpecs/StdBase.py

    commit 4468319
    Author: Seangchan Ryu <[email protected]>
    Date:   Wed Aug 7 11:19:38 2013 -0500

        add validation for assignment - workin progress

    commit 957e6a3
    Merge: 6518f43 0923ed4
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:41:03 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

    commit 6518f43
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:39:30 2013 -0500

        validation work in progress

    commit e010744
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 12:01:18 2013 -0500

        initial argument update validation

    commit 3f0aa75
    Merge: 7d6a00d f7a5f8e
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:47:18 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2_rest_7_3

        Conflicts:
        	src/python/WMCore/ReqMgr/Service/Request.py
        	test/python/WMCore_t/ReqMgr_t/Service_t/ReqMgr_t.py

    commit 7d6a00d
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:19:17 2013 -0500

        remove aux.json

commit 6b06929
Author: Seangchan Ryu <[email protected]>
Date:   Fri Nov 21 10:16:59 2014 -0600

    fix priority mapping

commit 5eb78fb
Author: Alan <[email protected]>
Date:   Wed Nov 19 13:29:10 2014 +0100

    fix job splitting for ACDC MCFakeFile

    now also accepts a different job splitting

    fix typo

commit d2ff9b6
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 12:00:18 2014 -0500

    Comment out authz_fake

commit 58427d7
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:38 2014 -0500

    Comment out printouts

commit f3e1f2d
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:08 2014 -0500

    Add activate actions for user/team managers

commit a7f7fc6
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:46 2014 -0400

    Chnage default threshold for reload

commit 51a9590
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:09 2014 -0400

    Add update_scripts method to automatically update scripts re-loading from its area

commit 57b5f95
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:02:18 2014 -0400

    Add scripts API to look-up script name

commit 3facb62
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:36 2014 -0400

    Use ajaxScript to update code snippet textarea

commit fba405b
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:12 2014 -0400

    Add ajaxScript function to look-up code snippet

commit 260ea4a
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Aug 25 11:13:02 2014 -0400

    Add prototype how to select existing python snippets, TODO: create repository python snippets and pass dict with them to template

commit 76e361c
Merge: 6849658 8fcd55e
Author: Valentin Kuznetsov <[email protected]>
Date:   Sun Nov 23 08:27:45 2014 -0500

    Fix git merge conflicts

commit 6849658
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 12:00:18 2014 -0500

    Comment out authz_fake

commit 8159085
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:38 2014 -0500

    Comment out printouts

commit 09a9245
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:08 2014 -0500

    Add activate actions for user/team managers

commit e911d18
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:46 2014 -0400

    Chnage default threshold for reload

commit ed88195
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:09 2014 -0400

    Add update_scripts method to automatically update scripts re-loading from its area

commit 5a3a008
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:02:18 2014 -0400

    Add scripts API to look-up script name

commit e611db8
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:36 2014 -0400

    Use ajaxScript to update code snippet textarea

commit 40af4b4
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:12 2014 -0400

    Add ajaxScript function to look-up code snippet

commit 400b61d
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Aug 25 11:13:02 2014 -0400

    Add prototype how to select existing python snippets, TODO: create repository python snippets and pass dict with them to template

commit ad92f71
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Jul 7 15:07:54 2014 -0400

    Adjust ReqMgrServer to new framework requirements

commit 2c92e23
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Jul 7 15:07:15 2014 -0400

    Fix response.status

commit ed544ed
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Jun 24 11:29:25 2014 -0400

    New code for ReqMgr web UI including changes for underlying WMCore

commit 479a04d
Author: Seangchan Ryu <[email protected]>
Date:   Fri Aug 23 13:37:23 2013 -0500

    Squashed commit of the following:

    commit fdeacde
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Aug 23 13:34:11 2013 -0500

        add clone test and fix assignment permission

    commit cc187d0
    Merge: 4468319 b356e27
    Author: Seangchan Ryu <[email protected]>
    Date:   Mon Aug 19 11:29:50 2013 -0500

        reqmgr rest api - work in progress
        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

        Conflicts:
        	src/python/WMCore/WMSpec/StdSpecs/StdBase.py

    commit 4468319
    Author: Seangchan Ryu <[email protected]>
    Date:   Wed Aug 7 11:19:38 2013 -0500

        add validation for assignment - workin progress

    commit 957e6a3
    Merge: 6518f43 0923ed4
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:41:03 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

    commit 6518f43
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:39:30 2013 -0500

        validation work in progress

    commit e010744
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 12:01:18 2013 -0500

        initial argument update validation

    commit 3f0aa75
    Merge: 7d6a00d f7a5f8e
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:47:18 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2_rest_7_3

        Conflicts:
        	src/python/WMCore/ReqMgr/Service/Request.py
        	test/python/WMCore_t/ReqMgr_t/Service_t/ReqMgr_t.py

    commit 7d6a00d
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:19:17 2013 -0500

        remove aux.json

commit 70f7844
Merge: c21fcb8 548a73a
Author: Seangchan Ryu <[email protected]>
Date:   Fri Nov 21 11:33:03 2014 -0600

    Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2

commit bec4f9a
Merge: 268b447 c21fcb8
Author: ticoann <[email protected]>
Date:   Thu Nov 20 09:49:02 2014 -0600

    Merge pull request dmwm#5480 from ticoann/reqmgr2

    fix config cache refactor update unit test

commit c21fcb8
Author: Seangchan Ryu <[email protected]>
Date:   Thu Nov 20 09:40:25 2014 -0600

    fix config cache refactor update unit test

commit 268b447
Merge: c84ad34 8eee784
Author: ticoann <[email protected]>
Date:   Tue Nov 18 14:33:15 2014 -0600

    Merge pull request dmwm#5477 from ticoann/reqmgr2

    Reqmgr2

commit 8eee784
Merge: c84ad34 f63b43d
Author: Seangchan Ryu <[email protected]>
Date:   Tue Nov 18 14:16:15 2014 -0600

    Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2

    Conflicts:
    	setup_dependencies.py
    	src/couchapps/ReqMgr/updates/updaterequest.js
    	src/python/WMCore/Lexicon.py
    	src/python/WMCore/ReqMgr/DataStructs/RequestStatus.py
    	src/python/WMCore/ReqMgr/Service/Request.py
    	src/python/WMCore/WMSpec/StdSpecs/StdBase.py
    	src/python/WMCore/WMSpec/WMWorkloadTools.py
    	test/data/ReqMgr/requests/ReReco.json

commit 8fcd55e
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 12:00:18 2014 -0500

    Comment out authz_fake

commit 8f67f96
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:38 2014 -0500

    Comment out printouts

commit def5e78
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Nov 10 11:59:08 2014 -0500

    Add activate actions for user/team managers

commit b6dd457
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:46 2014 -0400

    Chnage default threshold for reload

commit 67ff261
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Sep 2 10:32:09 2014 -0400

    Add update_scripts method to automatically update scripts re-loading from its area

commit 6f998b6
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:02:18 2014 -0400

    Add scripts API to look-up script name

commit b5c1b39
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:36 2014 -0400

    Use ajaxScript to update code snippet textarea

commit c3418cc
Author: Valentin Kuznetsov <[email protected]>
Date:   Wed Aug 27 11:01:12 2014 -0400

    Add ajaxScript function to look-up code snippet

commit ef6c641
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Aug 25 11:13:02 2014 -0400

    Add prototype how to select existing python snippets, TODO: create repository python snippets and pass dict with them to template

commit c84ad34
Merge: 74bc2bb 9b30b68
Author: ticoann <[email protected]>
Date:   Mon Jul 28 09:25:49 2014 -0500

    Merge pull request dmwm#5211 from vkuznet/reqmgr2

    Reqmgr changes

commit 9b30b68
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Jul 7 15:07:54 2014 -0400

    Adjust ReqMgrServer to new framework requirements

commit f2692a2
Author: Valentin Kuznetsov <[email protected]>
Date:   Mon Jul 7 15:07:15 2014 -0400

    Fix response.status

commit 74bc2bb
Merge: 237abac f2a2647
Author: ticoann <[email protected]>
Date:   Mon Jun 30 09:57:39 2014 -0500

    Merge pull request dmwm#5203 from vkuznet/reqmgr2

    New code for ReqMgr web UI including changes for underlying WMCore

commit f2a2647
Author: Valentin Kuznetsov <[email protected]>
Date:   Tue Jun 24 11:29:25 2014 -0400

    New code for ReqMgr web UI including changes for underlying WMCore

commit 237abac
Merge: aadc02c 021a666
Author: ticoann <[email protected]>
Date:   Mon Aug 26 07:09:20 2013 -0700

    Merge pull request dmwm#4755 from ticoann/reqmgr2

    Add dashboard dependency to reqmgr2.

commit 021a666
Author: Diego da Silva Gomes <[email protected]>
Date:   Tue Jul 2 16:31:43 2013 +0200

    Add dashboard dependency to reqmgr2.

commit aadc02c
Merge: 61a1da1 50af1fc
Author: ticoann <[email protected]>
Date:   Fri Aug 23 12:04:46 2013 -0700

    Merge pull request dmwm#4754 from ticoann/reqmgr2

    reqmgr2 september deployment candidate merge to reqmgr2 branch

commit 50af1fc
Author: Seangchan Ryu <[email protected]>
Date:   Fri Aug 23 13:37:23 2013 -0500

    Squashed commit of the following:

    commit fdeacde
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Aug 23 13:34:11 2013 -0500

        add clone test and fix assignment permission

    commit cc187d0
    Merge: 4468319 b356e27
    Author: Seangchan Ryu <[email protected]>
    Date:   Mon Aug 19 11:29:50 2013 -0500

        reqmgr rest api - work in progress
        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

        Conflicts:
        	src/python/WMCore/WMSpec/StdSpecs/StdBase.py

    commit 4468319
    Author: Seangchan Ryu <[email protected]>
    Date:   Wed Aug 7 11:19:38 2013 -0500

        add validation for assignment - workin progress

    commit 957e6a3
    Merge: 6518f43 0923ed4
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:41:03 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into validation_update

    commit 6518f43
    Author: Seangchan Ryu <[email protected]>
    Date:   Tue Jul 23 16:39:30 2013 -0500

        validation work in progress

    commit e010744
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 12:01:18 2013 -0500

        initial argument update validation

    commit 3f0aa75
    Merge: 7d6a00d f7a5f8e
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:47:18 2013 -0500

        Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2_rest_7_3

        Conflicts:
        	src/python/WMCore/ReqMgr/Service/Request.py
        	test/python/WMCore_t/ReqMgr_t/Service_t/ReqMgr_t.py

    commit 7d6a00d
    Author: Seangchan Ryu <[email protected]>
    Date:   Fri Jul 5 10:19:17 2013 -0500

        remove aux.json
  • Loading branch information
ticoann committed Dec 30, 2014
1 parent 949e873 commit ad0964d
Show file tree
Hide file tree
Showing 111 changed files with 13,632 additions and 800 deletions.
21 changes: 21 additions & 0 deletions bin/wmstats-update-status.py
Original file line number Diff line number Diff line change
@@ -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)
11 changes: 7 additions & 4 deletions src/couchapps/ReqMgr/updates/updaterequest.js
Original file line number Diff line number Diff line change
@@ -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();
Expand All @@ -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]);
Expand All @@ -42,4 +45,4 @@ function(doc, req)
}
}
return [doc, "OK"];
}
}
2 changes: 1 addition & 1 deletion src/couchapps/ReqMgr/views/bycampaign/map.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function(doc) {
if (doc.Campaign){
emit(doc.Camaign, null) ;
emit(doc.Campaign, null) ;
}
}
Binary file added src/html/ReqMgr/img/cms_logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions src/html/ReqMgr/javascript/ajax_utils.js
Original file line number Diff line number Diff line change
@@ -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);
}
});
}
Loading

0 comments on commit ad0964d

Please sign in to comment.