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

Merge pull request #598 from sbcgua/t514_status_fixes

Browse Source 
Manage files command
This commit is contained in:
Lars Hvam 2017-02-05 16:02:51 +01:00 committed by GitHub
commit 778fe02e1a
8 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,8 @@ form input:focus, textarea:focus {
.grey { color: lightgrey !important; }
.darkgrey { color: #808080 !important; }
.attention { color: red !important; }
.error { color: #d41919 !important; }
.warning { color: #e4ae0d !important; }
.blue { color: #5e8dc9 !important; }
.red { color: red !important; }
@ -105,6 +107,19 @@ span.page_title {
padding-left: 0.4em;
}
/* ERROR LOG */
div.log {
padding: 6px;
margin: 4px;
background-color: #fee6e6;
border: 1px #fdcece solid;
border-radius: 4px;
}
div.log > span { display:block; }
div.log .octicon { padding-right: 6px; }
/* MENU */
div.menu { display: inline; }
div.menu .menu_end { border-right: 0px !important; }

4
src/zabapgit_css_common.w3mi.xml
View File

@ -3,7 +3,7 @@
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
<asx:values>
<NAME>ZABAPGIT_CSS_COMMON</NAME>
<TEXT/>
<TEXT>Abapgit common CSS</TEXT>
<PARAMS>
<WWWPARAMS>
<RELID>MI</RELID>
@ -15,7 +15,7 @@
<RELID>MI</RELID>
<OBJID>ZABAPGIT_CSS_COMMON</OBJID>
<NAME>filename</NAME>
<VALUE>~wwwtmp.css</VALUE>
<VALUE>common.css</VALUE>
</WWWPARAMS>
<WWWPARAMS>
<RELID>MI</RELID>

1
src/zabapgit_definitions.prog.abap
View File

@ -227,6 +227,7 @@ CONSTANTS: BEGIN OF gc_action,
go_debuginfo TYPE string VALUE 'go_debuginfo',
go_settings TYPE string VALUE 'go_settings',
go_tutorial TYPE string VALUE 'go_tutorial',
jump TYPE string VALUE 'jump',
jump_pkg TYPE string VALUE 'jump_pkg',
END OF gc_action.

6
src/zabapgit_gui_router.prog.abap
View File

@ -35,8 +35,8 @@ CLASS lcl_gui_router DEFINITION FINAL.
RAISING lcx_exception.
METHODS get_page_stage
IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key
RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page
IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key
RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page
RAISING lcx_exception.
METHODS get_page_db_by_name
@ -310,7 +310,7 @@ CLASS lcl_gui_router IMPLEMENTATION.
CREATE OBJECT lo_stage_page
EXPORTING
io_repo = lo_repo.
io_repo = lo_repo.
ri_page = lo_stage_page.

3
src/zabapgit_page_stage.prog.abap
View File

@ -12,7 +12,8 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
METHODS:
constructor
IMPORTING io_repo TYPE REF TO lcl_repo_online
IMPORTING
io_repo TYPE REF TO lcl_repo_online
RAISING lcx_exception,
lif_gui_page~on_event REDEFINITION.

12
src/zabapgit_stage_logic.prog.abap
View File

@ -30,11 +30,13 @@ ENDCLASS.
CLASS lcl_stage_logic IMPLEMENTATION.
METHOD get.
rs_files-local = io_repo->get_files_local( ).
rs_files-remote = io_repo->get_files_remote( ).
remove_identical( CHANGING cs_files = rs_files ).
remove_ignored( EXPORTING io_repo = io_repo
CHANGING cs_files = rs_files ).
remove_ignored( EXPORTING io_repo = io_repo
CHANGING cs_files = rs_files ).
ENDMETHOD.
METHOD count.
@ -58,10 +60,14 @@ CLASS lcl_stage_logic IMPLEMENTATION.
lv_index = sy-tabix.
IF io_repo->get_dot_abapgit( )->is_ignored(
iv_path = <ls_remote>-path
iv_path = <ls_remote>-path
iv_filename = <ls_remote>-filename ) = abap_true.
DELETE cs_files-remote INDEX lv_index.
ELSEIF <ls_remote>-path = gc_root_dir AND <ls_remote>-filename = gc_dot_abapgit.
" Remove .abapgit from remotes - it cannot be removed or ignored
DELETE cs_files-remote INDEX lv_index.
ENDIF.
ENDLOOP.
ENDMETHOD.

12
src/zabapgit_util.prog.abap
View File

@ -1069,16 +1069,14 @@ CLASS lcl_log IMPLEMENTATION.
RETURN.
ENDIF.
ro_html->add( '<br>' ).
LOOP AT mt_log ASSIGNING <ls_log>.
CONCATENATE <ls_log>-msgv1
<ls_log>-msgv2
<ls_log>-msgv3
<ls_log>-msgv4 INTO lv_string SEPARATED BY space.
CONCATENATE <ls_log>-msgv1 <ls_log>-msgv2 <ls_log>-msgv3 <ls_log>-msgv4
INTO lv_string SEPARATED BY space.
ro_html->add( '<span class="error">' ).
ro_html->add_icon( iv_name = 'alert' iv_class = 'error' ). " warning CSS exists too
ro_html->add( lv_string ).
ro_html->add( '<br>' ).
ro_html->add( '</span>' ).
ENDLOOP.
ro_html->add( '<br>' ).
ENDMETHOD.

6
src/zabapgit_view_repo.prog.abap
View File

@ -146,7 +146,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
lo_log = lo_browser->get_log( ).
IF mo_repo->is_offline( ) = abap_false AND lo_log->count( ) > 0.
ro_html->add( '<div class="log attention">' ).
ro_html->add( '<div class="log">' ).
ro_html->add( lo_log->to_html( ) ). " shows eg. list of unsupported objects
ro_html->add( '</div>' ).
ENDIF.
@ -278,6 +278,10 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
iv_act = |{ gc_action-repo_remote_change }?{ lv_key }| ).
lo_tb_advanced->add( iv_txt = 'Make off-line'
iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ).
IF iv_rstate IS INITIAL AND iv_lstate IS INITIAL.
lo_tb_advanced->add( iv_txt = 'Force stage'
iv_act = |{ gc_action-go_stage }?{ lv_key }| ).
ENDIF.
ELSE.
lo_tb_advanced->add( iv_txt = 'Make on-line'
iv_act = |{ gc_action-repo_remote_attach }?{ lv_key }| ).