fix(gists): fixed bytes content returned in edit/copy content items§

rhodecode/templates/admin/gists/gist_edit.mako

@@ -1,136 +1,136 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('Edit Gist')} &middot; ${c.gist.gist_access_id}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='gists')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
 
     </div>
 
     <div class="table">
         <div id="files_data">
           ${h.secure_form(h.route_path('gist_update', gist_id=c.gist.gist_access_id), id='eform', request=request)}
             <div>
                 <input type="hidden" value="${c.file_last_commit.raw_id}" name="parent_hash">
                 <div>
                     <span class="gist-gravatar">
                       ${self.gravatar(h.email_or_none(c.rhodecode_user.full_contact), 30)}
                     </span>
                     <label for='lifetime'>${_('Gist lifetime')}</label>
                     ${h.dropdownmenu('lifetime', '0', c.lifetime_options)}
 
                     <label for='gist_acl_level'>${_('Gist access level')}</label>
                     ${h.dropdownmenu('gist_acl_level', c.gist.acl_level, c.acl_options)}
 
                     <textarea style="margin-top: 5px; border-color: #dbd9da" id="description" name="description"
                           placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea>
                 </div>
             </div>
 
             ## peppercorn schema
             <input type="hidden" name="__start__" value="nodes:sequence"/>
             % for cnt, file in enumerate(c.files):
                 <input type="hidden" name="__start__" value="file:mapping"/>
                 <div id="codeblock" class="codeblock" >
                   <div class="code-header">
                     <div class="form">
                       <div class="fields">
                         <input type="hidden" name="filename_org" value="${file.path}" >
                         <input id="filename_${h.FID('f',file.path)}" name="filename" size="30" type="text" value="${file.path}">
                           ${h.dropdownmenu('mimetype' ,'plain',[('plain',_('plain'))],enable_filter=True, id='mimetype_'+h.FID('f',file.path))}
                       </div>
                     </div>
                   </div>
                   <div class="editor_container">
                       <pre id="editor_pre"></pre>
-                      <textarea id="editor_${h.FID('f',file.path)}" name="content" >${file.content}</textarea>
+                      <textarea id="editor_${h.FID('f',file.path)}" name="content" >${file.str_content}</textarea>
                   </div>
                 </div>
                 <input type="hidden" name="__end__" />
 
                 ## dynamic edit box.
                 <script type="text/javascript">
                 $(document).ready(function(){
                     var myCodeMirror = initCodeMirror(
                             "editor_${h.FID('f',file.path)}", '');
 
                     var modes_select = $("#mimetype_${h.FID('f',file.path)}");
                     fillCodeMirrorOptions(modes_select);
 
                     // try to detect the mode based on the file we edit
                     var mimetype = "${file.mimetype}";
                     var detected_mode = detectCodeMirrorMode(
                             "${file.path}", mimetype);
 
                     if(detected_mode){
                         $(modes_select).select2("val", mimetype);
                         $(modes_select).change();
                         setCodeMirrorMode(myCodeMirror, detected_mode);
                     }
 
                     var filename_selector = "#filename_${h.FID('f',file.path)}";
                     // on change of select field set mode
                     setCodeMirrorModeFromSelect(
                             modes_select, filename_selector, myCodeMirror, null);
 
                     // on entering the new filename set mode, from given extension
                     setCodeMirrorModeFromInput(
                         modes_select, filename_selector, myCodeMirror, null);
                 });
                 </script>
             %endfor
             <input type="hidden" name="__end__" />
 
             <div class="pull-left">
             ${h.submit('update',_('Update Gist'),class_="btn btn-success")}
             <a class="btn" href="${h.route_path('gist_show', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a>
             </div>
           ${h.end_form()}
         </div>
     </div>
 
 </div>
 <script>
   $('#update').on('click', function(e){
       e.preventDefault();
 
       $(this).val('Updating...');
       $(this).attr('disabled', 'disabled');
       // check for newer version.
       $.ajax({
         url: "${h.route_path('gist_edit_check_revision', gist_id=c.gist.gist_access_id)}",
         data: {
             'revision': '${c.file_last_commit.raw_id}'
         },
         dataType: 'json',
         type: 'GET',
         success: function(data) {
           if(data.success === false){
             message = '${h.literal(_('Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version.')
               % {'here': h.link_to('here', h.route_path('gist_edit', gist_id=c.gist.gist_access_id))})}'
             alertMessage = [{"message": {
               "message": message, "force": "true", "level": "warning"}}];
             $.Topic('/notifications').publish(alertMessage[0]);
           }
           else{
             $('#eform').submit();
           }
         }
       });
   })
 
 </script>
 </%def>

rhodecode/templates/admin/gists/gist_show.mako

@@ -1,112 +1,112 b''
 <%inherit file="/base/base.mako"/>
 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
 <%def name="robots()">
     %if c.gist.gist_type != 'public':
       <meta name="robots" content="noindex, nofollow">
     %else:
       ${parent.robots()}
     %endif
 </%def>
 
 <%def name="title()">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='gists')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
 
     <div class="table">
         <div id="files_data">
             <div id="codeblock" class="codeblock">
                 <div class="code-header">
                     <div class="gist_url">
                         <div class="pull-left">
                             <code>
                             ${dt.gist_type(c.gist.gist_type)}
                             <span class="tag disabled">${c.gist.gist_access_id}</span>
                             ${c.gist.gist_url()} <span class="icon-clipboard clipboard-action" data-clipboard-text="${c.gist.gist_url()}" title="${_('Copy the url')}"></span>
                             </code>
                         </div>
 
                         <div class="pull-right buttons">
                           ## only owner should see that
-                          <a href="#copySource" onclick="return false;" class="btn btn-mini icon-clipboard no-grey clipboard-action" data-clipboard-text="${c.files[0].content}">${_('Copy content')}</a>
+                          <a href="#copySource" onclick="return false;" class="btn btn-mini icon-clipboard no-grey clipboard-action" data-clipboard-text="${c.files[0].str_content}">${_('Copy content')}</a>
 
                           %if c.is_super_admin or c.gist.gist_owner == c.rhodecode_user.user_id:
                           ${h.link_to(_('Edit'), h.route_path('gist_edit', gist_id=c.gist.gist_access_id), class_="btn btn-mini")}
                           %endif
                           ${h.link_to(_('Show as Raw'), h.route_path('gist_show_formatted', gist_id=c.gist.gist_access_id, revision='tip', format='raw'), class_="btn btn-mini")}
 
                           %if c.is_super_admin or c.gist.gist_owner == c.rhodecode_user.user_id:
                           <div class="pull-right remove_gist">
                             ${h.secure_form(h.route_path('gist_delete', gist_id=c.gist.gist_access_id), request=request)}
                                 <input class="btn btn-mini btn-danger" id="remove_gist" name="remove_gist"
                                        onclick="submitConfirm(event, this, _gettext('Confirm to delete this gist'), _gettext('Delete'), '${c.gist.gist_access_id}')"
                                        type="submit" value="${_('Delete')}"
                                 >
                             ${h.end_form()}
                           </div>
                           %endif
                         </div>
                     </div>
 
                     <div class="gist-desc">
                         <code>${c.gist.gist_description}</code>
                     </div>
 
                     <div class="author">
                         <div title="${h.tooltip(c.file_last_commit.author)}">
                           ${self.gravatar_with_user(c.file_last_commit.author, 16, tooltip=True)} - ${_('created')} ${h.age_component(c.file_last_commit.date)},
                           ${_('expires')}:
                            %if c.gist.gist_expires == -1:
                              ${_('never')}
                            %else:
                               ${h.age_component(h.time_to_utcdatetime(c.gist.gist_expires))}
                           %endif
                           </span>
                         </div>
 
                     </div>
                     <div class="commit">${h.urlify_commit_message(c.file_last_commit.message, None)}</div>
                 </div>
 
                ## iterate over the files
                % for gist_file in c.files:
                 <% renderer = c.render and h.renderer_from_filename(gist_file.path, exclude=['.txt', '.TXT'])%>
                 <!--
                 <div id="${h.FID('G', gist_file.path)}" class="stats" >
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b >${gist_file.path}</b>
                     <div>
                        ${h.link_to(_('Show as raw'), h.route_path('gist_show_formatted_path', gist_id=c.gist.gist_access_id, revision=gist_file.commit.raw_id, format='raw', f_path=gist_file.path), class_="btn btn-mini")}
                     </div>
                 </div>
                 -->
                 <div class="code-body textarea text-area editor">
                     %if renderer:
                         ${h.render(gist_file.str_content, renderer=renderer)}
                     %else:
                         ${h.pygmentize(gist_file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
                     %endif
                 </div>
                %endfor
             </div>
         </div>
     </div>
 
 
 </div>
 </%def>