Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.controller.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.controller.js (revision 2571) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.controller.js (working copy) @@ -17,7 +17,7 @@ //get user auth data //here not use localStorageService, beacuse we want to get raw str $scope.user_auth_data = userAuthService.build_auth_data(0, localStorage["auth_data"]); - + var extensionViewModel = this; $scope.currentPageIndex = 1; @@ -25,7 +25,7 @@ $scope.onPageChange = function (newPage) { $scope.currentPageIndex = newPage; }; - + extensionViewModel.batch_mode = false; extensionViewModel.batch_mode2 = false; extensionViewModel.repo_reachable = false; @@ -130,8 +130,8 @@ if (asc_desc == 'asc') { return a[which_time] - b[which_time]; } else { - return b[which_time] - a[which_time]; - } + return b[which_time] - a[which_time]; + } }); return result; } @@ -142,7 +142,7 @@ "Installation time desc": ["install_ts", "desc"] }[sort_rule_key] var which_time = sort_rule[0]; - var asc_desc = sort_rule[1]; + var asc_desc = sort_rule[1]; $scope.extensions_list = sort_by_time(which_time, asc_desc, $scope.extensions_list); } @@ -231,7 +231,7 @@ extensionViewModel.refreshInstallList(); - extensionViewModel.refreshAvailableList(); + // extensionViewModel.refreshAvailableList(); extensionViewModel.select_extension = function (name) { if (!extensionViewModel.batch_mode) { @@ -257,7 +257,7 @@ extensionViewModel.selected_extension_name_list.push(name); //2. 添加选中样式 extension.selected = true; - } + } } }); } @@ -287,7 +287,7 @@ extensionViewModel.selected_extension_name_list2.push(name); //2. 添加选中样式 extension.selected = true; - } + } } }); } Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.html (revision 2571) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/extension_mgmt/list/list.html (working copy) @@ -154,122 +154,122 @@
-
-
-
- {{'Available Extensions' | T}} -
-
-
- - - -
-
-
-
-
-
-
-
- {{each_extension.name}} -
-
-
-
- {{each_extension.name}} -
-
-
-
-
-
- -
-
- {{ extensionList.available_repo_error | T}} -
-
-
-
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{'No.' | T}}{{'Name' | T}}{{'Arch' | T}}{{'Version' | T}}{{'Release' | T}}{{'Size' | T}}{{'Repo' | T}}{{'Summary' | T}}{{'Description' | T}}
{{$index + 1}}{{row.name}}{{row.arch}}{{row.version}}{{row.release}}{{row.size}}{{row.repo}}{{row.summary}}{{row.description}} -
- -
-
-
-
-
-
-
-
- -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{'Update Extensions Manually' | T}} Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/cm/router.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/cm/router.py (revision 2571) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/cm/router.py (working copy) @@ -386,7 +386,8 @@ get_sidebar = request.GET["get_sidebar"] if not get_sidebar: commands.getstatusoutput("yum --disablerepo=* --enablerepo=array clean metadata") - check_status, check_output = commands.getstatusoutput("yum check-update --disablerepo=* --enablerepo=array") + # ToDo: Enable the check_status and check_output for checking updatable extensions once the repo is available. + # check_status, check_output = commands.getstatusoutput("yum check-update --disablerepo=* --enablerepo=array") session = get_current_session() session.cli.set_enable() system_version = session.cli.cmd("show version", RegexParser('AMP\s+(?P[^\.]+\.AMP(\.[0-9]+)+)'))["version"] @@ -449,7 +450,7 @@ continue else: result = cli_parse(output, ext_info_parse)[0] - # check the main version number of extensions with system main version number. + # check the main version number of extensions with the system main version number. result["ver_diff"] = True if result["version"].split(".")[:2] != system_version.split(".")[2:4] else False try: result["install_ts"] = time.mktime(datetime.datetime.strptime(result["install_date"], '%a %b %d %H:%M:%S %Y').timetuple()) @@ -465,20 +466,21 @@ result['updates'] = False extensions_res.append(result) - - # query all extension available packages for checking updatable at the same time. - if not get_sidebar and extension_list and check_status!= 256 and "Timeout" not in check_output: - extension_s = (" ").join(extension_list) - status, output = commands.getstatusoutput('yum info --disablerepo="*" --enablerepo="array" %s' % extension_s) - if "Available Packages" in output: - available_output = output.split("Available Packages")[1] - res = cli_parse(available_output, available_ext_parser) - for each in res: - for item in extensions_res: - if item["name"] == each["name"]: - item["updates"] = each["version"] - break + # ToDo: Enable check extension info once the repo is available. + # # query all extension available packages for checking updatable at the same time. + # if not get_sidebar and extension_list and check_status!= 256 and "Timeout" not in check_output: + # extension_s = (" ").join(extension_list) + # status, output = commands.getstatusoutput('yum info --disablerepo="*" --enablerepo="array" %s' % extension_s) + # + # if "Available Packages" in output: + # available_output = output.split("Available Packages")[1] + # res = cli_parse(available_output, available_ext_parser) + # for each in res: + # for item in extensions_res: + # if item["name"] == each["name"]: + # item["updates"] = each["version"] + # break return HttpResponse(json.dumps(extensions_res), content_type='application/json')