Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/custom/control.php

@@ -53,7 +53,7 @@ class custom extends control
             $this->app->loadConfig($module);
             $unitList = zget($this->config->$module, 'unitList', '');
             $this->view->unitList     = explode(',', $unitList);
-            $this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'rmb');
+            $this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'CNY');
         }
         if(($module == 'story' or $module == 'testcase') and $field == 'review')
         {
@@ -387,7 +387,7 @@ class custom extends control
             /* Update story estimate field. */
             if($unit != $_POST['hourPoint'])
             {
-                $stories = $this->dao->select('*')->from(TABLE_STORY)->fetchAll();
+                $stories = $this->dao->select('id,estimate')->from(TABLE_STORY)->fetchAll();
                 foreach($stories as $story)
                 {
                     $this->dao->update(TABLE_STORY)->set('estimate')->eq($story->estimate * $this->post->scaleFactor)->where('id')->eq($story->id)->exec();
@@ -460,6 +460,7 @@ class custom extends control
 
     /**
      * Edit story concept.
+     * @param  int    $key
      * 
      * @access public
      * @return void
@@ -489,6 +490,7 @@ class custom extends control
 
     /**
      * Delete story concept.
+     * @param  int    $key
      * 
      * @access public
      * @return void
@@ -502,6 +504,8 @@ class custom extends control
 
     /**
      * Delete story concept.
+     * @param  int    $key
+     * @param  string $confirm yse|no
      * 
      * @access public
      * @return void

module/group/lang/resource.php

@@ -1338,7 +1338,7 @@ $lang->user->methodOrder[35] = 'task';
 $lang->user->methodOrder[40] = 'bug';
 $lang->user->methodOrder[45] = 'project';
 $lang->user->methodOrder[50] = 'dynamic';
-$lang->user->methodOrder[55] = 'profile';
+$lang->user->methodOrder[55] = 'cropAvatar';
 $lang->user->methodOrder[60] = 'profile';
 $lang->user->methodOrder[65] = 'batchEdit';
 $lang->user->methodOrder[70] = 'unbind';

module/index/js/index.js

@@ -118,10 +118,7 @@
                 return 'project';
             }
         }
-        if(moduleName === 'user' && (link.params.fromModule || link.params.$2) == 'my')
-        {
-            return 'my';
-        }
+        if(moduleName === 'user' && (link.params.fromModule || link.params.$2) == 'my') return 'my';
 
         group = window.navGroup[moduleName] || moduleName || urlOrModuleName;
         return groupsMap[group] ? group : '';

module/my/view/profile.html.php

@@ -18,11 +18,11 @@
       <?php 
       if($user->avatar)
       {
-          echo html::image($app->user->avatar);
+          echo html::image($user->avatar);
       }
       else
       {
-          echo strtoupper($app->user->account[0]);
+          echo strtoupper($user->account[0]);
       }
       ?>
       </span>

module/project/control.php

@@ -2160,7 +2160,7 @@ class project extends control
         $project    = $this->project->getById($projectID);
         $products   = $this->project->getProducts($projectID);
         $browseLink = $this->createLink('project', 'story', "projectID=$projectID");
-        if($project->type == 'project') $browseLink = $this->createLink('projectstory', 'story');
+        if($project->type == 'project') $browseLink = $this->createLink('projectstory', 'story', "productID={$this->session->product}");
 
         $this->session->set('storyList', $this->app->getURI(true)); // Save session.
         if($project->type != 'project') $this->project->setMenu($this->projects, $project->id);     // Set menu.

module/upgrade/model.php

@@ -663,7 +663,6 @@ class upgradeModel extends model
         case '20_0_beta3':
             $this->saveLogs('Execute 20_0_beta3');
             $this->execSQL($this->getUpgradeFile('20.0.beta3'));
-            $this->addPriv20_0_bata3();
             $this->adjustBudgetUnit();
             $this->appendExec('20_0_beta3');
         }
@@ -4477,36 +4476,6 @@ class upgradeModel extends model
         return true;
     }
 
-    public function addPriv20_0_bata3()
-    {
-        $this->saveLogs('Run Method ' . __FUNCTION__);
-        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('user')->andWhere('method')->eq('view')->fetchPairs('group', 'group');
-        foreach($groups as $groupID)
-        {
-            $this->dao->replace(TABLE_GROUPPRIV)
-                ->set('module')->eq('user')
-                ->set('method')->eq('execution')
-                ->set('`group`')->eq($groupID)
-                ->exec();
-            $this->saveLogs($this->dao->get());
-
-            $this->dao->replace(TABLE_GROUPPRIV)
-                ->set('module')->eq('user')
-                ->set('method')->eq('issue')
-                ->set('`group`')->eq($groupID)
-                ->exec();
-            $this->saveLogs($this->dao->get());
-
-            $this->dao->replace(TABLE_GROUPPRIV)
-                ->set('module')->eq('user')
-                ->set('method')->eq('risk')
-                ->set('`group`')->eq($groupID)
-                ->exec();
-            $this->saveLogs($this->dao->get());
-        }
-        return true;
-    }
-
     /**
      * Adjust budget units and values.
      *