From 9d07e8a26657542c98535abb7812d83a98839918 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Sun, 18 Aug 2013 00:52:06 +0800 Subject: * improved 'indicator.views.follow_indicator()', renamed to 'indicator_fanduf()' due to name conflict * finished 'search' function for page indicator NewDeleteIndex.html * added 'apps/utils/search_tools.py': some tools to process search results * renamed 'sciblog/templatetags/tools.py' to 'get_range.py' * added 'format_data()' to indicator.tools': to format data of record/confine, make it properly display in html page; * 'indicator/javascripts/new_delete_index.js': added global 'var added_indexes_id' to track the already added indexes * added 'indicator/templatetags/divisible_by.py' filter to check if a number can be extactly divide by another number; * fixed the 'index_card_fir/index_card_sec' problem of 'act_card_container' of page 'SheetDefault.html' * indicator/static/css/new_delete_index.css: added 'index_search_error' and 'index_error' * fixed 'unit.dump' problems in 'indicator.models' * 'indicator.tools': o added 'RI_TYPES', 'RI_WEIGHTS' o added 'type' in the return value of 'calc_indicator_weight()' and 'recommend_indicator()' * added field 'followedHistories' in 'indicator.models.UserIndicator' * moved 'follow_indicator()' and 'unfollow_indicator()' from 'indicator.views' to 'indicator.tools' TODO: * highcharts: draw chart for indicator records; * add/edit data, and submit (page format design) * followed indicator submit buttion --- .../static/javascripts/delete_card_tip.js | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) (limited to '97suifangqa/apps/indicator/static/javascripts/delete_card_tip.js') diff --git a/97suifangqa/apps/indicator/static/javascripts/delete_card_tip.js b/97suifangqa/apps/indicator/static/javascripts/delete_card_tip.js index 099a216..9365d46 100644 --- a/97suifangqa/apps/indicator/static/javascripts/delete_card_tip.js +++ b/97suifangqa/apps/indicator/static/javascripts/delete_card_tip.js @@ -1,4 +1,7 @@ +// global js var: card_2_delete_id (type: string) + $(document).ready(function(){ +// console.log(parent.card_2_delete_id); //要取消关注的 卡片id 的获取方法 //点大叉、继续关注按钮,关闭弹层页面 $(".delete_card_tip_close, .action_confirm_ignore").bind("click", function(){ parent.TB_remove(); @@ -7,12 +10,23 @@ $(document).ready(function(){ //取消关注,关闭弹层页面 $(".action_confirm_cancel").bind("click", function(){ - //TODO - //底层数据层取消关注(ajax) - //console.log(parent.card_2_delete_id); //要取消关注的 卡片id 的获取方法 + // ajax process to unfollow the indicator + // indicator_id -> parseInt(parent.card_2_delete_id) + // 底层数据层取消关注(ajax) + var date = new Date(); + var time = date.getTime(); + $.ajax({ + type: 'get', + url: parent.indicator_url + 'ajax/unfollow_indicator', + data: 'indicator_id='+parent.card_2_delete_id+'&time='+time, + success: function(data) { + if (data == 'success') { + parent.delete_card(); + parent.TB_remove(); + } + }, + }); - parent.delete_card(); - parent.TB_remove(); return false; }); -}); \ No newline at end of file +}); -- cgit v1.2.2