From b51dab76eb6e6d64c787983f78130518494e9876 Mon Sep 17 00:00:00 2001 From: llj Date: Mon, 14 Mar 2016 19:51:09 +0800 Subject: [PATCH] [code clean] clean & fix --- media/css/seahub.css | 1 - media/img/rm.png | Bin 0 -> 424 bytes .../templates/share/priv_shared_files.html | 93 ------------------ seahub/templates/home_base.html | 33 +++++++ seahub/templates/snippets/events_body.html | 41 -------- seahub/templates/snippets/events_js.html | 81 --------------- seahub/urls.py | 2 +- seahub/views/__init__.py | 22 +++++ seahub/views/ajax.py | 25 +---- static/scripts/app/views/myhome.js | 6 -- 10 files changed, 57 insertions(+), 247 deletions(-) create mode 100644 media/img/rm.png delete mode 100644 seahub/share/templates/share/priv_shared_files.html delete mode 100644 seahub/templates/snippets/events_body.html delete mode 100644 seahub/templates/snippets/events_js.html diff --git a/media/css/seahub.css b/media/css/seahub.css index 9f4c0ff2d3..c1fddb48d5 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -2729,7 +2729,6 @@ textarea:-moz-placeholder {/* for FF */ width:756px; } #md-view h2, -#wmd-preview h2, #wiki-content h2 { border-bottom: 1px solid #ccc; } diff --git a/media/img/rm.png b/media/img/rm.png new file mode 100644 index 0000000000000000000000000000000000000000..df065d115d7ddb6868c887ab6b89faa9be041d2a GIT binary patch literal 424 zcmV;Z0ayNsP)KQ%o6h z;=8A)luHj|}z_exuN1Y5AItB#MU5S=3VZO(TOIjAs#7M*NR^ zxr^871SKP=n9(+jSy0lnq@~i0{#bFWUn{-tqns^|-RQuAbuV3yuwvI{l)eHdT~u!= SpCfVr0000 - -
- {% if priv_share_in %} - - - - - - - - - {% for e in priv_share_in %} - - {% if e.s_type == 'f' %} - - - {% else %} - - - {% endif %} - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Library" %}{% trans "From" %}{% trans "Operations" %}
{{e.file_or_dir}}{{e.file_or_dir}}--{{e.from_user|email2nickname}} - - - -
- {% else %} -
-

{% trans "No file is shared to you" %}

-

{% trans "Single files shared to you will be listed here, and you can download them or save them to some libraries." %}

-
- {% endif %} -
- - {% if user.permissions.can_add_repo %} -
- {% if priv_share_out %} - - - - - - - - - {% for e in priv_share_out %} - - {% if e.s_type == 'f' %} - - - {% else %} - - - {% endif %} - - - - - {% endfor %} -
{% trans "Name"%}{% trans "Library"%}{% trans "To"%}{% trans "Operations"%}
{% trans {{e.file_or_dir}}{% trans {{e.file_or_dir}}{{e.repo.name}}{{e.to_user|email2nickname}} - - - -
- {% else %} -
-

{% trans "You don't have any private shared files" %}

-

{% trans "You can share a single file with a registered user if you don't want to share a whole library." %}

-
- {% endif %} -
- {% endif %} - -{% endblock %} diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html index 81bf97b8ae..0321384ce9 100644 --- a/seahub/templates/home_base.html +++ b/seahub/templates/home_base.html @@ -36,6 +36,9 @@

{% trans "Tools" %}

+ {% if user.permissions.can_add_repo %} + + {% endif %}
  • {% trans "Starred" %}
    • @@ -62,9 +65,39 @@ {% endblock %} {% block main_panel %} +{% if user.permissions.can_add_repo %} +
    {% csrf_token%} +

    {% trans "Enable Modules"%}

    +
      + {% for mod in request.user.mods_available %} + {% if mod == 'personal wiki' %} +
    • + +
      • + {% endif %} + {% endfor %} +
    + +
    +{% endif %} {% endblock %} {% block extra_script %} {% endblock %} diff --git a/seahub/templates/snippets/events_body.html b/seahub/templates/snippets/events_body.html deleted file mode 100644 index 21eeabb760..0000000000 --- a/seahub/templates/snippets/events_body.html +++ /dev/null @@ -1,41 +0,0 @@ -{% load seahub_tags avatar_tags i18n %} - -{% for e_group in event_groups %} -

    {{ e_group.date }}

    -
      - {% for e in e_group.events %} -
    1. - {% avatar e.author 36 %} -
      - {% if e.etype == "repo-update" %} - {% with repo=e.repo commit=e.commit %} -

      - {{ repo.name }} - - {{ commit.converted_cmmt_desc|translate_commit_desc_escape|safe }} - {% if commit.more_files %} - {% if repo.encrypted %} - {% trans 'Details' %} - {% else %} - {% trans 'Details' %} - {% endif %} - {% endif %} - -

      - {% endwith %} - {% endif %} - - {% if e.etype == "repo-create" %} -

      {% trans "Created library" %} {{ e.repo_name }}

      - {% endif %} - - {% if e.etype == "repo-delete" %} -

      {% blocktrans with library_name=e.repo_name %}Deleted library {{ library_name }}{% endblocktrans %}

      - {% endif %} - -

      {{ e.author|email2nickname }} {{ e.time|translate_seahub_time }}

      -
      -
      2. - {% endfor %} -
    -{% endfor %} diff --git a/seahub/templates/snippets/events_js.html b/seahub/templates/snippets/events_js.html deleted file mode 100644 index 79dce5e360..0000000000 --- a/seahub/templates/snippets/events_js.html +++ /dev/null @@ -1,81 +0,0 @@ -{% load i18n %} -{% include 'snippets/list_commit_detail.html' %} - -function reqEvents(start) { - $('#events-loading').removeClass('hide'); - $.ajax({ - url:'{% url 'events' %}?start=' + start, - dataType: 'json', - cache: false, - success: function(data) { - // for data fetched by clicking 'more' - var original_last_date = $('.event-group-hd:last'), - original_last_events, - new_first_date, new_first_events; - - $('#events-loading').addClass('hide'); - $('#events-body').append(data['html']); - - new_first_date = original_last_date.next().next(); - if (original_last_date.text() == new_first_date.text()) { - original_last_events = original_last_date.next(); - new_first_events = new_first_date.next(); - original_last_events.append(new_first_events.html()); - new_first_date.remove(); - new_first_events.remove(); - } - - $('.updated-repo').each(function() { - $(this).next().css({'margin-right':$(this).width() + 10}); - }); - - if (data['events_more']) { - var new_start = data['new_start']; - $('#events-more').data('start', new_start).removeClass('hide'); - } else { - $('#events-more').addClass('hide'); - } - - if ($.browser.mozilla || $.browser.msie) { - $('#events a').focus(function() { - $(this).blur(); - }); - } - $('.lsch').click(function() { - listCommitDetails($(this).data('url'), $(this).data('time')); - return false; - }); - $('.lsch-encrypted').click(function() { - showDetailForEncrypRepo($(this)); - return false; - }); - }, - error: function(jqXHR, textStatus, errorThrown) { - $('#events-loading').addClass('hide'); - if (!jqXHR.responseText && textStatus != 'abort') { - $('#events-error').html("{% trans "Failed. Please check the network." %}").removeClass('hide'); - } - } - }); -} -//reqEvents(0); - -function showDetailForEncrypRepo(obj) { - if (obj.data('passwordset')) { - listCommitDetails(obj.data('url'), obj.data('time')); - } else { - var form = $('#repo-decrypt-form'); - form.find('input[name="repo_id"]').val(obj.data('repoid')); - form.find('.op-target').html(obj.data('reponame')); - form.data({'url':obj.data('url'), 'time':obj.data('time')}).modal({appendTo:'#main'}); - $('#simplemodal-container').css({'width':'auto'}); - $(window).resize(); - } -} - -$('#events-more').click(function() { - $(this).addClass('hide'); - reqEvents($(this).data('start')); -}); - -{% include 'snippets/repo_decrypt_js.html' %} diff --git a/seahub/urls.py b/seahub/urls.py index 599cd3d499..0e483b3992 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -117,6 +117,7 @@ urlpatterns = patterns( url(r'^user/(?P[^/]+)/msgs/$', user_msg_list, name='user_msg_list'), url(r'^user/(?P\d+)/msgdel/$', user_msg_remove, name='user_msg_remove'), url(r'^user/(?P\d+)/remsgdel/$', user_received_msg_remove, name='user_received_msg_remove'), + url(r'^modules/toggle/$', toggle_modules, name="toggle_modules"), url(r'^download_client_program/$', TemplateView.as_view(template_name="download.html"), name="download_client"), url(r'^choose_register/$', TemplateView.as_view(template_name="choose_register.html"), name="choose_register"), @@ -161,7 +162,6 @@ urlpatterns = patterns( url(r'^ajax/set_notices_seen/$', set_notices_seen, name='set_notices_seen'), url(r'^ajax/set_notice_seen_by_id/$', set_notice_seen_by_id, name='set_notice_seen_by_id'), url(r'^ajax/space_and_traffic/$', space_and_traffic, name='space_and_traffic'), - url(r'^ajax/events/$', events, name="events"), url(r'^ajax/repo/(?P[-0-9a-f]{36})/setting/change-basic-info/$', ajax_repo_change_basic_info, name='ajax_repo_change_basic_info'), url(r'^ajax/repo/(?P[-0-9a-f]{36})/setting/transfer-owner/$', ajax_repo_transfer_owner, name='ajax_repo_transfer_owner'), url(r'^ajax/repo/(?P[-0-9a-f]{36})/setting/change-passwd/$', ajax_repo_change_passwd, name='ajax_repo_change_passwd'), diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index 8eb0484de8..0b847144e5 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -1388,6 +1388,28 @@ def convert_cmmt_desc_link(request): logger.warn('diff_result: %s' % (d.__dict__)) raise Http404 +@login_required +def toggle_modules(request): + """Enable or disable modules. + """ + if request.method != 'POST': + raise Http404 + + referer = request.META.get('HTTP_REFERER', None) + next = settings.SITE_ROOT if referer is None else referer + + username = request.user.username + personal_wiki = request.POST.get('personal_wiki', 'off') + if personal_wiki == 'on': + enable_mod_for_user(username, MOD_PERSONAL_WIKI) + messages.success(request, _('Successfully enable "Personal Wiki".')) + else: + disable_mod_for_user(username, MOD_PERSONAL_WIKI) + if referer.find('wiki') > 0: + next = settings.SITE_ROOT + messages.success(request, _('Successfully disable "Personal Wiki".')) + + return HttpResponseRedirect(next) storage = get_avatar_file_storage() def latest_entry(request, filename): diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 8d56e41238..89de2eee5b 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -38,7 +38,7 @@ from seahub.group.models import PublicGroup from seahub.signals import upload_file_successful, repo_created, repo_deleted from seahub.views import validate_owner, \ get_unencry_rw_repos_by_user, is_registered_user, \ - get_system_default_repo_id, get_diff, group_events_data, \ + get_system_default_repo_id, get_diff, \ get_owned_repo_list, check_folder_permission, is_registered_user from seahub.views.modules import get_enabled_mods_by_group, \ get_available_mods_by_group, enable_mod_for_group, \ @@ -1817,29 +1817,6 @@ def _create_repo_common(request, repo_name, repo_desc, encryption, return repo_id -@login_required_ajax -def events(request): - events_count = 15 - username = request.user.username - start = int(request.GET.get('start')) - - if is_org_context(request): - org_id = request.user.org.org_id - events, start = get_org_user_events(org_id, username, start, events_count) - else: - events, start = get_user_events(username, start, events_count) - - events_more = True if len(events) == events_count else False - - event_groups = group_events_data(events) - ctx = {'event_groups': event_groups} - html = render_to_string("snippets/events_body.html", ctx) - - return HttpResponse(json.dumps({'html': html, - 'events_more': events_more, - 'new_start': start}), - content_type='application/json; charset=utf-8') - @login_required_ajax def ajax_repo_change_basic_info(request, repo_id): """Handle post request to change library basic info. diff --git a/static/scripts/app/views/myhome.js b/static/scripts/app/views/myhome.js index 7255209955..857ea34243 100644 --- a/static/scripts/app/views/myhome.js +++ b/static/scripts/app/views/myhome.js @@ -33,12 +33,6 @@ define([ this.currentView = this.reposView; }, - showMySubRepos: function() { - this.currentView.hide(); - this.subReposView.show(); - this.currentView = this.subReposView; - }, - showSharedRepos: function() { this.currentView.hide(); this.sharedReposView.show();