SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

page_diff UX: pre-merge fixes

Browse Source
This commit is contained in:
Alexander Tsybulsky 2017-03-11 11:23:18 +02:00
parent be79b3234a
commit fe6a4c6567
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zabapgit_css_common.w3mi.data.css
View File

@ -184,7 +184,6 @@ table.repo_tab {
border: 1px solid #DDD; border: 1px solid #DDD;
border-radius: 3px; border-radius: 3px;
background: #fff; background: #fff;
margin-top: 0.5em;
width: 100%; width: 100%;
} }
.repo_tab td { .repo_tab td {

4
src/zabapgit_page_diff.prog.abap
View File

@ -48,7 +48,7 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page.
mt_delayed_lines TYPE lcl_diff=>ty_diffs_tt, mt_delayed_lines TYPE lcl_diff=>ty_diffs_tt,
mv_unified TYPE abap_bool VALUE abap_true, mv_unified TYPE abap_bool VALUE abap_true,
mv_repo_key TYPE lcl_persistence_repo=>ty_repo-key, mv_repo_key TYPE lcl_persistence_repo=>ty_repo-key,
mv_seed TYPE string. mv_seed TYPE string. " Unique page id to bind JS sessionStorage
METHODS render_diff METHODS render_diff
IMPORTING is_diff TYPE ty_file_diff IMPORTING is_diff TYPE ty_file_diff
@ -105,7 +105,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
mv_repo_key = iv_key. mv_repo_key = iv_key.
GET TIME STAMP FIELD lv_ts. GET TIME STAMP FIELD lv_ts.
mv_seed = |diff{ lv_ts }|. mv_seed = |diff{ lv_ts }|. " Generate based on time
ASSERT is_file IS INITIAL OR is_object IS INITIAL. " just one passed ASSERT is_file IS INITIAL OR is_object IS INITIAL. " just one passed

6
src/zabapgit_page_stage.prog.abap
View File

@ -26,7 +26,7 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
PRIVATE SECTION. PRIVATE SECTION.
DATA: mo_repo TYPE REF TO lcl_repo_online, DATA: mo_repo TYPE REF TO lcl_repo_online,
ms_files TYPE ty_stage_files, ms_files TYPE ty_stage_files,
mv_seed TYPE string. mv_seed TYPE string. " Unique page id to bind JS sessionStorage
METHODS: METHODS:
render_list render_list
@ -68,7 +68,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
ms_files = lcl_stage_logic=>get( mo_repo ). ms_files = lcl_stage_logic=>get( mo_repo ).
mv_seed = iv_seed. mv_seed = iv_seed.
IF mv_seed IS INITIAL. IF mv_seed IS INITIAL. " Generate based on time unless obtained from diff page
GET TIME STAMP FIELD lv_ts. GET TIME STAMP FIELD lv_ts.
mv_seed = |stage{ lv_ts }|. mv_seed = |stage{ lv_ts }|.
ENDIF. ENDIF.
@ -318,7 +318,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
CREATE OBJECT ro_html. CREATE OBJECT ro_html.
ro_html->add( 'var gStageParams = {' ). ro_html->add( 'var gStageParams = {' ).
ro_html->add( | seed: "{ mv_seed }",| ). ro_html->add( | seed: "{ mv_seed }",| ). " Unique page id
ro_html->add( ' formAction: "stage_commit",' ). ro_html->add( ' formAction: "stage_commit",' ).
ro_html->add( ' ids: {' ). ro_html->add( ' ids: {' ).