Git Merge Request #303: Fix ForgeBlog revert issue and added confirmation (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Shalitha Suranga wants to merge 3 commits from /u/shalithasuranga/allura/ to master, 2018-10-27

Fixes [#8249]

Commit Date  
[ccd619] (patch5) by Shalitha Shalitha

[#8249] Refactor markup to jinja a macro 🚀

 2018-10-23 20:20:29 Tree
[e25e4b] by Shalitha Shalitha

[#8249] Add test for ForgeBlog revert

 2018-10-21 08:02:48 Tree
[1e222d] by Shalitha Shalitha

[#8249] Fix ForgeBlog revert issue and add confirmation dialog

 2018-10-21 08:01:45 Tree

Discussion

  • Kenton Taylor - 2018-10-23

    Functionally working well. Would be nice however to refactor the markup for the modal dialog out into a jinja macro however, so that chunk of code isn't duplicated in two places.

     

  • Shalitha Suranga - 2018-10-23

    Or you mean duplication of this portion

          <div class="confirmation_dialog_{{p.version}}" style="display:none">
        {{ g.icons['close'].render(tag='b', extra_css='close') }}
        <h1>Confirm revert to version {{p.version}}</h1>
      .....
     

    • Shalitha Suranga - 2018-10-23

      I will do refactoring and push an update. Thanks

       

  • Shalitha Suranga - 2018-10-23

    Hi. Kenton

    Refactored in to separate file since theme_macros has only theme related stuff.

     

    Last edit: Shalitha Suranga 2018-10-24

  • Shalitha Suranga - 2018-10-26

    Any update regarding this merge request..?

     

  • Kenton Taylor - 2018-10-26
    • Status: open --> merged
     

  • Kenton Taylor - 2018-10-26

    Hi Shalitha,

    Refactor looks good, this is now merged!

     

    • Shalitha Suranga - 2018-10-27

      Thanks Kenton 👍

       

Log in to post a comment.