users: use new session store for temporary settings for users.

- use for clone url type selection
- use for diffs mode

rhodecode/apps/home/__init__.py

@@ -63,6 +63,10 b' def includeme(config):'
         name='markup_preview',
         pattern='/_markup_preview')
 
+    config.add_route(
+        name='store_user_session_value',
+        pattern='/_store_session_attr')
+
     # register our static links via redirection mechanism
     routing_links.connect_redirection_links(config)
 

rhodecode/apps/home/views.py

@@ -444,3 +444,18 b' class HomeView(BaseAppView):'
         if text:
             return h.render(text, renderer=renderer, mentions=True)
         return ''
+
+    @LoginRequired()
+    @CSRFRequired()
+    @view_config(
+        route_name='store_user_session_value', request_method='POST',
+        renderer='string', xhr=True)
+    def store_user_session_attr(self):
+        key = self.request.POST.get('key')
+        val = self.request.POST.get('val')
+
+        existing_value = self.request.session.get(key)
+        if existing_value != val:
+            self.request.session[key] = val
+
+        return 'stored:{}'.format(key)

rhodecode/lib/base.py

@@ -357,6 +357,28 b' def attach_context_attributes(context, r'
         'appenlight.api_public_key', '')
     context.appenlight_server_url = config.get('appenlight.server_url', '')
 
+    diffmode = {
+        "unified": "unified",
+        "sideside": "sideside"
+    }.get(request.GET.get('diffmode'))
+
+    if diffmode and diffmode != request.session.get('rc_user_session_attr.diffmode'):
+        request.session['rc_user_session_attr.diffmode'] = diffmode
+
+    # session settings per user
+    session_attrs = {
+        # defaults
+        "clone_url_format": "http",
+        "diffmode": "sideside"
+    }
+    for k, v in request.session.items():
+        pref = 'rc_user_session_attr.'
+        if k and k.startswith(pref):
+            k = k[len(pref):]
+            session_attrs[k] = v
+
+    context.user_session_attrs = session_attrs
+
     # JS template context
     context.template_context = {
         'repo_name': None,
@@ -367,6 +389,7 b' def attach_context_attributes(context, r'
             'email': None,
             'notification_status': False
         },
+        'session_attrs': session_attrs,
         'visual': {
             'default_renderer': None
         },
@@ -385,18 +408,6 b' def attach_context_attributes(context, r'
     }
     # END CONFIG VARS
 
-    diffmode = 'sideside'
-    if request.GET.get('diffmode'):
-        if request.GET['diffmode'] == 'unified':
-            diffmode = 'unified'
-    elif request.session.get('diffmode'):
-        diffmode = request.session['diffmode']
-
-    context.diffmode = diffmode
-
-    if request.session.get('diffmode') != diffmode:
-        request.session['diffmode'] = diffmode
-
     context.csrf_token = auth.get_csrf_token(session=request.session)
     context.backends = rhodecode.BACKENDS.keys()
     context.backends.sort()

rhodecode/public/js/rhodecode/routes.js

@@ -150,6 +150,7 b' function registerRCRoutes() {'
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('markup_preview', '/_markup_preview', []);
+    pyroutes.register('store_user_session_value', '/_store_session_attr', []);
     pyroutes.register('journal', '/_admin/journal', []);
     pyroutes.register('journal_rss', '/_admin/journal/rss', []);
     pyroutes.register('journal_atom', '/_admin/journal/atom', []);

rhodecode/public/js/src/rhodecode.js

@@ -553,3 +553,20 b' var feedLifetimeOptions = function(query'
 
     query.callback(data);
 };
+
+
+var storeUserSessionAttr = function (key, val) {
+
+    var postData = {
+        'key': key,
+        'val': val,
+        'csrf_token': CSRF_TOKEN
+    };
+
+    var success = function(o) {
+        return true
+    };
+
+    ajaxPOST(pyroutes.url('store_user_session_value'), postData, success);
+    return false;
+};

rhodecode/templates/codeblocks/diffs.mako

@@ -83,7 +83,7 b" return '%s_%s_%i' % (h.safeid(filename),"
 collapse_all = len(diffset.files) > collapse_when_files_over
 %>
 
-%if c.diffmode == 'sideside':
+%if c.user_session_attrs["diffmode"] == 'sideside':
 <style>
 .wrapper {
     max-width: 1600px !important;
@@ -162,24 +162,24 b' collapse_all = len(diffset.files) > coll'
             ${diff_ops(filediff)}
         </label>
         ${diff_menu(filediff, use_comments=use_comments)}
-        <table class="cb cb-diff-${c.diffmode} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
+        <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
 
         ## new/deleted/empty content case
         % if not filediff.hunks:
             ## Comment container, on "fakes" hunk that contains all data to render comments
-            ${render_hunk_lines(c.diffmode, filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)}
+            ${render_hunk_lines(c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)}
         % endif
 
         %if filediff.limited_diff:
                 <tr class="cb-warning cb-collapser">
-                    <td class="cb-text" ${(c.diffmode == 'unified' and 'colspan=4' or 'colspan=6')}>
+                    <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
                         ${_('The requested commit is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
                     </td>
                 </tr>
         %else:
             %if over_lines_changed_limit:
                     <tr class="cb-warning cb-collapser">
-                        <td class="cb-text" ${(c.diffmode == 'unified' and 'colspan=4' or 'colspan=6')}>
+                        <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
                             ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
                             <a href="#" class="cb-expand"
                                onclick="$(this).closest('table').removeClass('cb-collapsed'); return false;">${_('Show them')}
@@ -194,20 +194,20 b' collapse_all = len(diffset.files) > coll'
 
         % for hunk in filediff.hunks:
             <tr class="cb-hunk">
-                <td ${(c.diffmode == 'unified' and 'colspan=3' or '')}>
+                <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}>
                     ## TODO: dan: add ajax loading of more context here
                     ## <a href="#">
                         <i class="icon-more"></i>
                     ## </a>
                 </td>
-                <td ${(c.diffmode == 'sideside' and 'colspan=5' or '')}>
+                <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}>
                     @@
                     -${hunk.source_start},${hunk.source_length}
                     +${hunk.target_start},${hunk.target_length}
                     ${hunk.section_header}
                 </td>
             </tr>
-            ${render_hunk_lines(c.diffmode, hunk, use_comments=use_comments, inline_comments=inline_comments)}
+            ${render_hunk_lines(c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments)}
         % endfor
 
         <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
@@ -215,7 +215,7 b' collapse_all = len(diffset.files) > coll'
         ## outdated comments that do not fit into currently displayed lines
         % for lineno, comments in unmatched_comments.items():
 
-            %if c.diffmode == 'unified':
+            %if c.user_session_attrs["diffmode"] == 'unified':
                 % if loop.index == 0:
                 <tr class="cb-hunk">
                     <td colspan="3"></td>
@@ -234,7 +234,7 b' collapse_all = len(diffset.files) > coll'
                         ${inline_comments_container(comments, inline_comments)}
                     </td>
                 </tr>
-            %elif c.diffmode == 'sideside':
+            %elif c.user_session_attrs["diffmode"] == 'sideside':
                 % if loop.index == 0:
                 <tr class="cb-comment-info">
                     <td colspan="2"></td>
@@ -303,18 +303,18 b' collapse_all = len(diffset.files) > coll'
                     </span>
                 </label>
 
-                <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
+                <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
                     <tr>
-                        % if c.diffmode == 'unified':
+                        % if c.user_session_attrs["diffmode"] == 'unified':
                         <td></td>
                         %endif
 
                         <td></td>
-                        <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
+                        <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}>
                         ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
                         </td>
                     </tr>
-                    %if c.diffmode == 'unified':
+                    %if c.user_session_attrs["diffmode"] == 'unified':
                     <tr class="cb-line">
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
@@ -323,7 +323,7 b' collapse_all = len(diffset.files) > coll'
                             ${inline_comments_container(comments_dict['comments'], inline_comments)}
                         </td>
                     </tr>
-                    %elif c.diffmode == 'sideside':
+                    %elif c.user_session_attrs["diffmode"] == 'sideside':
                     <tr class="cb-line">
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
@@ -734,13 +734,13 b' def get_comments_for(diff_type, comments'
             <div class="btn-group">
 
                 <a
-                  class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
+                  class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-primary')} tooltip"
                   title="${h.tooltip(_('View side by side'))}"
                   href="${h.current_route_path(request, diffmode='sideside')}">
                     <span>${_('Side by Side')}</span>
                 </a>
                 <a
-                  class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
+                  class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-primary')} tooltip"
                   title="${h.tooltip(_('View unified'))}" href="${h.current_route_path(request, diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>

rhodecode/templates/summary/summary.mako

@@ -60,15 +60,25 b''
 
 <script type="text/javascript">
 $(document).ready(function(){
-    $('#clone_option').on('change', function(e) {
-        var selected = $(this).val();
+
+    var showCloneField = function(clone_url_format){
         $.each(['http', 'http_id', 'ssh'], function (idx, val) {
-            if(val === selected){
+            if(val === clone_url_format){
                 $('#clone_option_' + val).show();
+                $('#clone_option').val(val)
             } else {
                 $('#clone_option_' + val).hide();
             }
         });
+    };
+    // default taken from session
+    showCloneField(templateContext.session_attrs.clone_url_format);
+
+    $('#clone_option').on('change', function(e) {
+        var selected = $(this).val();
+
+        storeUserSessionAttr('rc_user_session_attr.clone_url_format', selected);
+        showCloneField(selected)
     });
 
     var initialCommitData = {